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
..
2015-10-28 21:22:07 +02:00
2016-04-18 22:35:18 -04:00
2016-01-09 06:24:43 +01:00
2015-03-31 20:42:37 +03:00
2015-03-17 11:30:56 +10:00
2016-04-18 22:35:18 -04:00
2016-04-18 22:35:18 -04:00
2016-04-18 22:35:18 -04:00
2016-04-18 22:35:18 -04:00