Joshua Dwire 10462cdeb4 Merge remote-tracking branch 'origin/v5-develop' into v5-develop ... # Conflicts: # resources/views/email/import/completed.blade.php		2021-02-16 18:20:27 -05:00
..
Controllers	Merge remote-tracking branch 'origin/v5-develop' into v5-develop	2021-02-16 18:20:27 -05:00
Livewire	Hide draft credits from client	2021-02-11 14:14:11 +01:00
Middleware	Update copyright + version bump + set canadian dollar symbol to $	2021-01-04 08:54:54 +11:00
Requests	Merge remote-tracking branch 'origin/v5-develop' into v5-develop	2021-02-16 18:20:27 -05:00
ValidationRules	Remove strings and replace with translations	2021-01-24 22:48:09 +11:00
ViewComposers	minor fixes for client portal	2021-01-15 22:19:34 +11:00
Kernel.php	Update copyright + version bump + set canadian dollar symbol to $	2021-01-04 08:54:54 +11:00