mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 22:56:42 +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 |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |