luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-09 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
core [Glitch] Run eslint --fix 2023-02-03 20:52:07 +01:00
flavours Further JS code style changes 2023-02-04 22:31:47 +01:00
fonts
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00