vt-social/app/javascript
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
..
core [Glitch] Add graphs and retention metrics to admin dashboard () 2021-10-14 21:45:01 +02:00
flavours [Glitch] Replace deprecated String.prototype.substr() 2022-04-06 16:08:33 +02:00
fonts
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
skins Glitchsoc translation to 'es' language () 2020-10-19 22:17:29 +02:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00