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

Further cleanup

2015-10-20 15:10:18 +02:00

acl_button.js

Minor layouting fixes

2015-10-20 15:51:22 +02:00

acl_information.js

Rename intersectAcls to intersectList and do some clean up

2015-10-20 18:10:48 +02:00

create_editions_button.js

fix create editions for filter widget

2015-08-06 13:43:53 +02:00

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

rename apiUrls to ApiUrls

2015-08-07 15:08:02 +02:00