luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-16 07:00:57 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
flavours [Glitch] Fix logo button style more 2021-01-06 19:03:52 +01:00
fonts
images
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
packs Add ability to require invite request text (#15326) 2020-12-14 10:03:09 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00