1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-23 16:13:15 -05:00
Claire b368c75029 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.
2022-04-06 21:10:23 +02:00
..
2022-03-28 12:43:58 +02:00
2017-06-04 14:57:02 +02:00
2017-06-04 14:59:52 +02:00
2022-03-06 22:51:40 +01:00