mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 07:32:09 +00: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 |
||
---|---|---|
.. | ||
applications | ||
deletes | ||
exports | ||
flavours | ||
follower_domains | ||
imports | ||
keyword_mutes | ||
migrations | ||
notifications | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentications |