luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-10-11 15:41:09 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:49:42 +02:00
flavours Fix 'App settings' label visible in sidebar on mobile UI (#1888) 2022-11-05 08:12:04 +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-06 09:50:41 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
skins Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00