Glitch-Shrike/app
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
..
chewy Change `tootctl search deploy` algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
mailers Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
serializers Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
views Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00