]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 6 Apr 2022 19:10:23 +0000 (21:10 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 6 Apr 2022 19:10:23 +0000 (21:10 +0200)
commitb368c7502931aa06121ecad8a97193b1f17cf90a
tree2b598363926388d30a4c5c6197436b46f6d4610a
parent00c9363f07081e0149533023992fba47dd905384
parentdd4c156f33a24b8bb89b45b2697aa4036c3ae5be
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.
app/controllers/auth/sessions_controller.rb
app/models/user.rb
app/services/remove_status_service.rb
config/routes.rb