fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
core [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
flavours Fix toggling sidebar on mobile in admin pages 2022-02-16 16:33:23 +01:00
fonts
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00