mastodon/config/webpack/rules
Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
..
babel.js
css.js Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-03 14:54:30 +02:00
file.js
index.js
mark.js
node_modules.js Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 2019-03-30 01:41:35 +01:00