Hillel Coren 0dcee794b5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: resources/lang/en/texts.php resources/views/accounts/invoice_design.blade.php resources/views/invoices/edit.blade.php		2016-04-19 22:48:03 +03:00
..
deleted.blade.php	Added support for custom subdomains	2015-04-28 23:13:52 +03:00
edit.blade.php	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-04-19 22:48:03 +03:00
history.blade.php	Finalize multi-plan support	2016-04-18 22:35:18 -04:00
knockout.blade.php	Trim whitespace in JS from emails on invoice page	2016-04-14 10:39:12 +03:00
pdf.blade.php	Finalize multi-plan support	2016-04-18 22:35:18 -04:00
view.blade.php	Finalize multi-plan support	2016-04-18 22:35:18 -04:00