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
..
acl_button_list.js
acl_button.js
acl_information.js
create_editions_button.js
delete_button.js	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh	2015-10-20 18:11:41 +02:00
unconsign_request_button.js