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-11-24 21:45:38 +02:00
2016-01-20 01:07:31 +02:00
2016-04-16 19:14:43 -04:00
2015-10-14 17:15:39 +03:00
2015-11-24 21:45:38 +02:00
2016-03-22 12:08:48 +02:00
2015-11-11 14:20:51 +02:00
2015-11-11 14:17:58 +02:00
2015-11-11 14:17:58 +02:00
2016-04-18 22:35:18 -04:00