tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
invoiceninja/resources
History
Hillel Coren ebd258d655 Merge branch 'release-2.7.0' 
Conflicts:
	app/Http/Controllers/DashboardController.php
	app/Http/Requests/UpdateInvoiceRequest.php
	app/Http/routes.php
	composer.lock
	resources/views/payments/credit_card.blade.php
2016-09-12 13:36:53 +03:00
..
assets Working on the dashboard 2016-09-11 17:30:23 +03:00
lang Merge branch 'release-2.7.0' 2016-09-12 13:36:53 +03:00
views Merge branch 'release-2.7.0' 2016-09-12 13:36:53 +03:00