4 Commits

Author SHA1 Message Date
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
Jeramy Simpson
c6d8b6f8e1 Merge Master Changes
Had to manually resolve conflict issues
2015-03-26 10:10:22 +10:00
Hillel Coren
d773c72970 Working on setup page 2015-03-25 21:56:31 +02:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10:00