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
..
api_urls.js	piece view	2015-07-08 22:54:07 +02:00
application_constants.js	Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar	2015-06-19 13:13:37 +02:00
languages.js	translated english text to french	2015-07-08 09:57:50 +02:00