You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config/webpack
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
configuration.js Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
development.js
generateLocalePacks.js Javascript intl8n flavour support 8 years ago
production.js Upgrade compression-webpack-plugin to version 1.0.1 (#5581) 8 years ago
shared.js Linting fixes 8 years ago
test.js
translationRunner.js Fix RFC 5646 Regular Expression (#6190) 7 years ago