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
..
Controllers	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-04-19 22:48:03 +03:00
Middleware	Finalize multi-plan support	2016-04-18 22:35:18 -04:00
Requests	Removed validation pre-processing code	2016-04-10 21:48:51 +03:00
Kernel.php	Add user permission support	2016-03-15 19:08:00 -04:00
routes.php	Merge pull request #815 from joshuadwire/enterprise-plan	2016-04-19 17:40:17 +03:00