1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-25 10:47:10 +02:00
invoiceninja/resources
Jeramy Simpson b51f889219 Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5
Fixed Conflicts:
	resources/views/invoices/view.blade.php
2015-04-06 10:32:23 +10:00
..
assets/less Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00
lang Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-04-06 10:32:23 +10:00
views Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-04-06 10:32:23 +10:00