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
..
index	Clean up localization - fixes #760, modifies pull request #755	2013-07-31 00:31:31 -04:00
project	Clean up localization - fixes #760, modifies pull request #755	2013-07-31 00:31:31 -04:00
gdata-extension.js	Migrate to OAuth2	2013-02-10 14:17:28 -05:00