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
..
migrations	Merge branch 'master' of https://github.com/invoiceninja/invoiceninja	2016-01-11 20:39:18 +01:00
seeds	Added support for Chinese	2016-01-08 00:19:44 +02:00
.gitignore	Posibility to modify payment terms	2016-01-07 20:39:51 +01:00