RandomSec/extensions/freebase/module/scripts
Blakko 6e90bc41f6 Merge remote-tracking branch 'origin/master' into internationalization
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 11:07:59 +02:00
..
dialogs Merge remote-tracking branch 'origin/master' into internationalization 2013-07-25 11:07:59 +02:00
util Clean up commented out code 2013-03-18 20:20:23 -04:00
extension.js Freebase extension internationalized 2013-06-27 12:03:51 +02:00