luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 4e3c68e025 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.
2022-03-17 19:23:39 +01:00
..
core [Glitch] Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 21:45:01 +02:00
flavours [Glitch] Fix edit history dropdown and modal in light theme 2022-03-12 12:03:57 +01:00
fonts
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-03-17 19:23:39 +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-03-12 11:51:25 +01:00