Antonin Delpeuch bcdd04d062 Merge branch 'master' of https://github.com/noamoss/OpenRefine into noamoss ... Conflicts: extensions/freebase/module/langs/translation-he.json main/webapp/modules/core/langs/translation-en.json		2017-08-12 09:45:23 +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 branch 'default-to-english' of https://github.com/RBGKew/OpenRefine into RBGKew-default-to-english	2017-08-09 14:07:22 +01:00
tests	Merge branch 'master' of https://github.com/OpenRefine/OpenRefine	2017-08-06 22:06:58 -05:00
webapp	Merge branch 'master' of https://github.com/noamoss/OpenRefine into noamoss	2017-08-12 09:45:23 +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