luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 04:13:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.
2023-01-18 17:38:11 +01:00
..
core Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
flavours [Glitch] Remove hardcoded width from dropdown overlays 2023-01-12 17:48:10 +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-12-15 20:25:25 +01:00
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
packs Fix “Add new domain block” button using last submitted instead of current search value (#22485) 2023-01-05 13:42:38 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00