Tim Daubenschütz 95e0b256b6 Merge branch 'master' into AD-613-cyland-white-label-page ... Conflicts: .gitignore		2015-08-11 11:50:09 +02:00
..
api_urls.js	rename apiUrls to ApiUrls	2015-08-07 15:08:02 +02:00
application_constants.js	Merge branch 'master' into AD-613-cyland-white-label-page	2015-08-11 11:50:09 +02:00
languages.js	specify editions generically by whitelabel	2015-07-15 01:40:48 +02:00