Tim Daubenschütz a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ...

Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss

2015-10-15 10:06:39 +02:00

..

api_urls.js

withdraw consign

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

application_constants.js

Increase additional data file size

2015-10-13 10:13:53 +02:00

information_text.js

information added to forms and delete form title changed, acl information component created, information text is added to the constants

2015-10-13 18:33:08 +02:00

languages.js

change text in signup form

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