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
..
Controllers	Merge branch 'master' of https://github.com/invoiceninja/invoiceninja	2016-01-11 20:39:18 +01:00
Middleware	Merging: custom font support	2016-01-07 09:08:30 +02:00
Requests	Merge branch 'master' of https://github.com/invoiceninja/invoiceninja	2016-01-11 20:39:18 +01:00
Kernel.php	Updating design	2015-04-22 22:21:04 +03:00
routes.php	Merge branch 'master' of https://github.com/invoiceninja/invoiceninja	2016-01-11 20:39:18 +01:00