steenrabol 6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja ... # Conflicts: # app/Http/Controllers/InvoiceController.php # resources/lang/en/texts.php # resources/views/invoices/edit.blade.php		2016-01-11 20:39:18 +01:00
..
ContactMailer.php	Bug fixes	2015-12-31 12:23:39 +02:00
Mailer.php	Added check for mail config settings	2016-01-11 13:07:41 +02:00
UserMailer.php	Working on email markup	2015-12-16 13:49:26 +02:00
VendorContactMailer.php	Vendor	2016-01-07 16:21:13 +01:00