Hillel Coren d2d22fbb50 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ...

Conflicts:
	resources/views/invoices/knockout.blade.php

2016-03-27 18:20:48 +03:00

..

assets/less

Bring in Laravel5 framework.

2015-03-12 10:44:39 +10:00

lang

Make dropzone translatable

2016-03-24 18:45:00 -04:00

views

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

2016-03-27 18:20:48 +03:00