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
..
AppServiceProvider.php	Vendor management	2016-01-06 15:23:58 +01:00
BusServiceProvider.php	Bring in Laravel5 framework.	2015-03-12 10:44:39 +10:00
ConfigServiceProvider.php	Reworking events for L5	2015-03-31 20:42:37 +03:00
EventServiceProvider.php	Merge branch 'master' of https://github.com/invoiceninja/invoiceninja	2016-01-11 20:39:18 +01:00
RouteServiceProvider.php	Fixing Dependancies, re-organising files	2015-03-13 15:01:27 +10:00