Antonin Delpeuch 18b1942169 Merge branch 'extend-data-fixes' ... Conflicts: main/webapp/modules/core/langs/translation-en.json		2017-08-13 20:17:18 +01:00
..
modules/core	Merge branch 'extend-data-fixes'	2017-08-13 20:17:18 +01:00
WEB-INF	fix some xml issues	2017-08-06 22:05:17 -05:00