Tim Daubenschütz 28dfcfa75a Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page ... Conflicts: js/components/ascribe_detail/edition.js js/components/ascribe_forms/form_login.js js/components/ascribe_forms/form_signup.js		2015-10-06 16:40:02 +02:00
..
detail_property.js
edition_action_panel.js
edition_container.js
edition.js	Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page	2015-10-06 16:40:02 +02:00
further_details_fileuploader.js
further_details.js
history_iterator.js
license_detail.js
media_container.js
note.js
piece_container.js
piece.js