Tim Daubenschütz ed3624198a Merge branch 'master' into AD-1309-change-share-to-email ... Conflicts: js/components/ascribe_buttons/acls/acl_button.js		2015-11-16 16:55:33 +01:00
..
acl_information_text.js	Adjust info text for email	2015-11-10 19:35:42 +01:00
api_urls.js	Finalizing basic submission flow with lazy evaluated form	2015-11-09 17:52:09 +01:00
application_constants.js	Merge branch 'master' into AD-56-add-social-share-functionality	2015-11-16 15:54:49 +01:00
languages.js	Change instances of "Share" to be "Email"	2015-11-10 11:53:05 +01:00