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
..
detail_property.js
edition_action_panel.js	Remove misleading editions prop to pieceOrEditions	2015-11-02 15:19:52 +01:00
edition_container.js	Move onChange() to after componentWillUnmount() for ESLint	2015-11-04 13:57:15 +01:00
edition.js	Replace all occurrences of with momentjs	2015-11-03 10:57:41 +01:00
further_details_fileuploader.js	Remove warning for missing prop from FurtherDetailsFileUploader	2015-11-02 10:42:15 +01:00
further_details.js
history_iterator.js
license_detail.js
media_container.js	Merge branch 'master' into AD-56-add-social-share-functionality	2015-11-16 15:54:49 +01:00
note.js
piece_container.js	Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio	2015-11-16 13:50:13 +01:00
piece.js