vrde 641e8ac82d Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ... Conflicts: js/components/edition.js js/mixins/inject_in_head_mixin.js		2015-06-03 17:44:13 +02:00
..
alert_mixin.js
form_mixin.js
inject_in_head_mixin.js
modal_mixin.js
table_column_mixin.js