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
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
7 years ago
..
loaders Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
configuration.js Fix building assets in test environment 8 years ago
development.js Upgrade webpack to version v4.x (#6655) 8 years ago
generateLocalePacks.js Javascript intl8n flavour support 8 years ago
production.js Update dependencies for Node.js (2018-12-31) (#9669) 7 years ago
shared.js Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
test.js Upgrade webpack to version v4.x (#6655) 8 years ago
translationRunner.js Fix RFC 5646 Regular Expression (#6190) 8 years ago