David Yip 1253279feb

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb

2018-01-21 13:36:10 -06:00

..

loaders

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

configuration.js

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-21 13:36:10 -06:00

development.js

Configure webpack to poll for changes in development (#5040)

2017-10-04 09:52:11 +02:00

generateLocalePacks.js

Javascript intl8n flavour support

2017-12-10 11:08:04 -08:00

production.js

Upgrade compression-webpack-plugin to version 1.0.1 (#5581)

2017-11-01 14:42:19 +01:00

shared.js

Linting fixes

2017-12-10 11:08:04 -08:00

test.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

translationRunner.js

Fix RFC 5646 Regular Expression (#6190)

2018-01-05 04:43:50 +01:00