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 69737b703a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
flavours Fix local-only toggle being buggy when replying to remote toot 2021-05-12 12:38:21 +02:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-05-17 10:30:34 +02:00
packs Add ability to require invite request text (#15326) 2020-12-14 10:03:09 +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-05-12 11:03:05 +02:00