Tom Morris 218ea46a4d Merge remote-tracking branch 'blakko/internationalization' - close #755 ... 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		2013-07-25 10:53:25 -04:00
..
dialog.js	Freebase extension internationalized	2013-06-27 12:03:51 +02:00
schema-alignment-dialog.html	Merge remote-tracking branch 'blakko/internationalization' - close #755	2013-07-25 10:53:25 -04:00
ui-link.js	Freebase extension internationalized	2013-06-27 12:03:51 +02:00
ui-node.js	Freebase extension internationalized	2013-06-27 12:03:51 +02:00