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
..
assets/less	Bring in Laravel5 framework.	2015-03-12 10:44:39 +10:00
lang	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-04-19 22:48:03 +03:00
views	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-04-19 22:48:03 +03:00