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
..
migrations	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-04-19 22:48:03 +03:00
seeds	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-04-19 22:48:03 +03:00
.gitignore	Posibility to modify payment terms	2016-01-07 20:39:51 +01:00