diminator fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js		2015-07-09 14:54:11 +01:00
..
collapsible_button.js
collapsible_paragraph.js	translated english text to french	2015-07-08 09:57:50 +02:00