mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
1b8fcd4df5
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins/vanilla/win95 | ||
styles |