Tom Morris eeb082b763 Merge remote-tracking branch 'origin/master' into fusiontables-migration ... Conflicts: extensions/freebase/module/langs/translation-default.json extensions/freebase/module/langs/translation-en.json extensions/freebase/module/langs/translation-it.json extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java extensions/gdata/module/MOD-INF/controller.js extensions/gdata/module/langs/translation-default.json extensions/gdata/module/langs/translation-en.json extensions/gdata/module/langs/translation-it.json extensions/gdata/src/com/google/refine/extension/gdata/commands/LoadLanguageCommand.java main/src/com/google/refine/commands/lang/LoadLanguageCommand.java main/src/com/google/refine/commands/lang/SetLanguageCommand.java main/webapp/modules/core/langs/translation-default.json main/webapp/modules/core/langs/translation-en.json main/webapp/modules/core/langs/translation-it.json main/webapp/modules/core/scripts/index/lang-settings-ui.js		2013-08-16 17:56:56 -04:00
..
langs	Line endings	2013-08-16 16:25:27 -04:00
MOD-INF	Merge remote-tracking branch 'origin/master' into fusiontables-migration	2013-08-16 17:56:56 -04:00
scripts	Merge remote-tracking branch 'origin/master' into fusiontables-migration	2013-08-16 17:56:56 -04:00
styles	Consolidated the two different forms for public URLs together into one. Made sure we could still import public docs while signed in.	2011-11-17 01:32:28 +00:00
authorize.vt	gdata-extension internationalization	2013-06-27 17:25:53 +02:00
authorized.vt	gdata-extension internationalization	2013-06-27 17:25:53 +02:00
index.vt	Issue 630: Change branding from Google Refine to OpenRefine	2012-10-18 19:40:31 -04:00
macros.vm	Drop -extension suffix	2010-10-14 20:35:16 +00:00