]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 16 Dec 2021 15:19:28 +0000 (16:19 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 16 Dec 2021 15:20:44 +0000 (16:20 +0100)
commitb2526316f54839968c821295e63066beaa425159
treeb13a52c19923edfb80518f82ac060f296e68aeb2
parentd911c17f521d6b13861caa886715a50b644007a1
parent2aafa5b4e7a83ce8195cd739f1233a52ab060db7
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.
app/controllers/concerns/two_factor_authentication_concern.rb
app/javascript/mastodon/actions/compose.js
app/javascript/packs/public.js
app/models/account.rb
app/views/admin/accounts/index.html.haml
app/views/admin/dashboard/index.html.haml
config/navigation.rb
config/routes.rb
db/schema.rb
package.json
yarn.lock