vrde 3ad7763577 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k ... Conflicts: js/components/ascribe_detail/media_container.js		2015-07-15 12:21:31 +02:00
..
detail_property.js	piece view	2015-07-08 22:54:07 +02:00
edition_container.js	loading feedback for piece and edition page	2015-07-13 15:21:09 +02:00
edition.js	merge	2015-07-14 17:46:19 +02:00
further_details.js	fix warnings	2015-07-10 14:15:22 +02:00
media_container.js	Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k	2015-07-15 12:21:31 +02:00
piece_container.js	fixed signup serializer, acl_editions_view	2015-07-15 11:39:08 +02:00
piece.js	basically reverting media player changes	2015-07-15 11:47:14 +02:00