luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
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
..
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
paperclip Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
templates
cli.rb Fix help text around tootctl email_domain_blocks (#14147) 2020-06-26 21:28:40 +02:00