Glitch-Shrike/lib/mastodon
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
..
accounts_cli.rb Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
cache_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
cli_helper.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
domains_cli.rb Change `tootctl domains purge` to accept multiple domains at once (#12046) 2019-10-02 04:49:53 +02:00
emoji_cli.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
feeds_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
media_cli.rb Add retry for failed media downloads and `tootctl media refresh` (#11775) 2019-09-10 15:29:12 +02:00
migration_helpers.rb
premailer_webpack_strategy.rb
preview_cards_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
redis_config.rb
search_cli.rb Add parallelization to `tootctl search deploy` (#12051) 2019-10-02 21:50:43 +02:00
settings_cli.rb
snowflake.rb
statuses_cli.rb Fix tootctl statuses remove 2019-07-24 15:55:39 +02:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00