mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 11:38:07 +01: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 |
||
---|---|---|
.. | ||
show.html.haml |