luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-23 07:14:10 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config/webpack/rules
History
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
..
babel.js
css.js Fix build with new sass-loader 2019-11-07 14:56:09 +01:00
file.js
index.js Update Tesseract.js (#14708) 2020-09-01 00:26:10 +02:00
mark.js
node_modules.js Update Tesseract.js (#14708) 2020-09-01 00:26:10 +02:00
tesseract.js Update Tesseract.js (#14708) 2020-09-01 00:26:10 +02:00