1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 17:31:35 +02:00
invoiceninja/resources
Hillel Coren f42e8158c2 Merge branch 'release-2.6.4'
Conflicts:
	app/Http/Controllers/AccountController.php
	app/Http/routes.php
	app/Models/User.php
	resources/lang/en/texts.php
2016-07-19 19:18:24 +03:00
..
assets/less Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00
lang Merge branch 'release-2.6.4' 2016-07-19 19:18:24 +03:00
views Show WePay's fees 2016-07-18 23:10:04 +03:00