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
..
2016-04-18 22:35:18 -04:00
2016-04-18 22:35:18 -04:00
2015-03-17 07:45:25 +10:00
2016-03-02 15:36:42 +02:00
2016-03-15 19:08:00 -04:00
2016-03-02 16:36:46 +02:00
2016-03-02 15:36:42 +02:00
2016-03-22 21:21:05 +11:00
2016-03-02 15:36:42 +02:00
2016-03-02 15:36:42 +02:00
2015-10-02 11:32:13 +03:00
2016-03-02 15:36:42 +02:00
2016-03-02 16:36:46 +02:00
2016-03-17 10:11:14 -04:00
2016-03-02 15:36:42 +02:00
2016-03-02 16:36:46 +02:00
2016-04-18 22:35:18 -04:00
2016-03-02 16:36:46 +02:00