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
..
deleted.blade.php	Add Files	2015-03-17 07:45:25 +10:00
edit.blade.php	Working on L5	2015-04-05 22:15:37 +03:00
history.blade.php	Add Files	2015-03-17 07:45:25 +10:00
pdf.blade.php	Working on users in L5	2015-03-30 22:45:10 +03:00
view.blade.php	Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5	2015-04-06 10:32:23 +10:00