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
..
fr_CA	Started work on French Canadian (Quebec) locale	2015-04-04 01:30:31 -04:00