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

2019-01-02 15:36:53 +01:00

..

loaders

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-02 15:36:53 +01:00

configuration.js

Fix building assets in test environment

2018-09-13 15:32:02 +02:00

development.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

generateLocalePacks.js

Javascript intl8n flavour support

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

production.js

Update dependencies for Node.js (2018-12-31) (#9669)

2018-12-31 18:11:48 +01:00

shared.js

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-02 15:36:53 +01:00

test.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

translationRunner.js

Fix RFC 5646 Regular Expression (#6190)

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