218ea46a4d
Conflicts: extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html main/webapp/modules/core/index.vt main/webapp/modules/core/project.vt main/webapp/modules/core/scripts/project/browsing-engine.js main/webapp/modules/core/scripts/project/history-panel.html |
||
---|---|---|
.. | ||
.settings | ||
module | ||
src/com/google/refine/freebase | ||
.classpath | ||
.project | ||
build.xml |