RandomSec/main/webapp/modules
Antonin Delpeuch 00f8e4fc6b Merge pull request #1237.
Conflicts:
	.classpath
	main/webapp/modules/core/langs/translation-en.json
	main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js

Closes #363 and #56.
2017-08-28 16:25:50 +01:00
..
core Merge pull request #1237. 2017-08-28 16:25:50 +01:00