vrde 72821001b7 Merge branch 'AD-601-in-piece_detail-longer-titles-are' ... Conflicts: .gitignore		2015-08-03 13:44:53 +02:00
..
detail_property.js
edition_container.js
edition.js	Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are	2015-07-30 11:49:48 +02:00
further_details.js
media_container.js
piece_container.js
piece.js