RandomSec/extensions
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
..
freebase Merge remote-tracking branch 'origin/master' into internationalization 2013-07-25 11:07:59 +02:00
gdata Merge remote-tracking branch 'origin/master' into internationalization 2013-07-25 11:07:59 +02:00
jython Specify target Java version for bundled extensions - addresses part 2013-07-10 15:45:25 -04:00
pc-axis Specify target Java version for bundled extensions - addresses part 2013-07-10 15:45:25 -04:00
sample Specify target Java version for bundled extensions - addresses part 2013-07-10 15:45:25 -04:00
build.xml Issue 630: Change branding from Google Refine to OpenRefine 2012-10-18 19:40:31 -04:00