Tim Daubenschütz 339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality ... Conflicts: js/components/ascribe_detail/media_container.js js/components/ascribe_media/media_player.js		2015-11-16 15:54:49 +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
information_text.js	Making AclInformation more robust by adding checks for if the information to display is available	2015-10-20 18:00:59 +02:00
languages.js	change text in signup form	2015-09-22 11:41:10 +02:00