luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-12 07:27:36 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
core
flavours [Glitch] Fix for "follows you" indicator in light web UI not readable 2023-07-17 13:01:47 +02:00
fonts
hooks
icons
images Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
packs
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
types