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
..
admin	Working on migrations	2021-02-03 10:59:58 +11:00
auth	Refactor password reset for admin users	2021-02-15 10:39:40 +11:00
components	E-mail improvements:	2021-01-20 13:18:17 +01:00
import	Merge remote-tracking branch 'origin/v5-develop' into v5-develop	2021-02-16 18:20:27 -05:00
invoices	Update e-mail templates	2021-01-19 11:05:47 +01:00
migration	Translate migration email	2021-01-25 08:08:29 +11:00
partials	Fixes for displaying company logo in email templates	2021-01-13 12:22:23 +11:00
quotes	Update e-mail templates	2021-01-19 11:05:47 +01:00
support	remove from passed data	2021-01-21 10:41:05 +01:00
template	E-mail improvements:	2021-01-20 13:18:17 +01:00
example.blade.php	New email design (#3386)	2020-02-27 07:55:23 +11:00