luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 12:24:31 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.
2022-01-16 18:11:20 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
flavours [Glitch] Fix media descriptions not being used for client-side filtering 2022-01-07 19:54:58 +01:00
fonts
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 18:11:20 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +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 2021-12-18 11:44:54 +01:00