luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-30 00:56:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +01:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:49:42 +02:00
flavours Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-11-12 13:28:03 +01:00