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 |
||
---|---|---|
.. | ||
browsing-engine.js | ||
exporters.js | ||
extension-bar.js | ||
history-apply-dialog.html | ||
history-entry.html | ||
history-extract-dialog.html | ||
history-panel.html | ||
history-panel.js | ||
process-panel.js | ||
progress-panel.html | ||
scripting.js | ||
summary-bar.js |