Hillel Coren bddc4dd915 Merge branch 'lang_ja' of git://github.com/mzdakr/invoiceninja into mzdakr-lang_ja ... Conflicts: app/Providers/AppServiceProvider.php database/seeds/CurrenciesSeeder.php		2016-03-13 13:35:32 +02:00
..
assets/less	Bring in Laravel5 framework.	2015-03-12 10:44:39 +10:00
lang	Merge branch 'lang_ja' of git://github.com/mzdakr/invoiceninja into mzdakr-lang_ja	2016-03-13 13:35:32 +02:00
views	Fix for checkouit.com integration	2016-03-09 20:31:54 +02:00