Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: js/components/ascribe_forms/form_share_email.js js/components/ascribe_forms/form_transfer.js js/utils/general_utils.js sass/main.scss		2015-10-22 13:38:49 +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 buttons for cc	2015-10-21 14:52:25 +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