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

Conflicts:
	app/Models/Account.php

2016-05-29 12:27:14 +03:00

..

assets/less

Bring in Laravel5 framework.

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

lang

Added setting to hide second tax rate

2016-05-29 12:26:02 +03:00

views

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

2016-05-29 12:27:14 +03:00