RandomSec/main
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
..
.settings correct classpath references and java version 2017-07-18 22:15:46 +01:00
IDEs Update to Clojure 1.4. Closes issue #634 2013-02-12 00:15:35 -05:00
src Merge pull request #1237. 2017-08-28 16:25:50 +01:00
tests Merge pull request #1237. 2017-08-28 16:25:50 +01:00
webapp Merge pull request #1237. 2017-08-28 16:25:50 +01:00
.classpath correct classpath references and java version 2017-07-18 22:15:46 +01:00
.gitignore another gitignore for eclipse git support 2010-05-31 09:00:37 +00:00
.project Convert mixed Java/Javascript projects to faceted form so we can support both languages in Eclipse 2010-10-15 21:42:49 +00:00