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

withdraw consign

2015-09-29 18:09:34 +02:00

application_constants.js

Merged in AD-744-search-filter-not-working-i-type- (pull request #97)

2015-10-15 15:16:33 +02:00

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

change text in signup form

2015-09-22 11:41:10 +02:00