mastodon/config/webpack/loaders
Thibaut Girka 44f2224606 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
..
assets.js Improve eslint rules (#3147) 2017-05-20 17:31:47 +02:00
babel.js Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
babel_external.js Remove prop types from external libraries (#5304) 2017-10-10 18:44:51 +02:00
mark.js Add improved performance marks for development mode (#3297) 2017-05-25 14:09:55 +02:00
sass.js Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00