Tim Daubenschütz 8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: package.json		2015-10-20 18:11:41 +02:00
..
api_urls.js
application_constants.js
information_text.js	Making AclInformation more robust by adding checks for if the information to display is available	2015-10-20 18:00:59 +02:00
languages.js