You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		7 years ago
..
loaders	Merge upstream 2.0ish #165	7 years ago
configuration.js	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
development.js	Configure webpack to poll for changes in development (#5040)	7 years ago
generateLocalePacks.js	Javascript intl8n flavour support	7 years ago
production.js	Upgrade compression-webpack-plugin to version 1.0.1 (#5581)	7 years ago
shared.js	Linting fixes	7 years ago
test.js	Improve eslint rules (#3147)	8 years ago
translationRunner.js	Fix RFC 5646 Regular Expression (#6190)	7 years ago