invoiceninja/app
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
..
Commands Refactored to events 2015-10-28 21:22:07 +02:00
Console Finalize multi-plan support 2016-04-18 22:35:18 -04:00
Events Expense module 2016-01-09 06:24:43 +01:00
Exceptions Brought back error page in production 2016-04-18 20:17:02 +03:00
Handlers Reworking events for L5 2015-03-31 20:42:37 +03:00
Http Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-19 22:48:03 +03:00
Includes Update Namespaces & Syntax 2015-03-17 11:30:56 +10:00
Libraries Finalize multi-plan support 2016-04-18 22:35:18 -04:00
Listeners Finalize multi-plan support 2016-04-18 22:35:18 -04:00
Models Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-19 22:48:03 +03:00
Ninja Merge pull request #815 from joshuadwire/enterprise-plan 2016-04-19 17:40:17 +03:00
Providers Finalize multi-plan support 2016-04-18 22:35:18 -04:00
Services Finalize multi-plan support 2016-04-18 22:35:18 -04:00