mastodon/app
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
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-11-30 12:13:54 +01:00
mailers Fix error on trending mailer due to missing constant (#17072) 2021-11-29 17:39:40 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00