Glitch-Shrike/lib
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
..
action_dispatch
active_record
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
paperclip Fix upload of remote media with OpenStack Swift sometimes failing (#16998) 2021-11-16 21:36:28 +01:00
rails
redis
sanitize_ext
tasks Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
templates
terrapin
webpacker
cli.rb Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688) 2021-10-14 19:59:28 +02:00
enumerable.rb
exceptions.rb