mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-15 03:15:32 +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 |
||
|---|---|---|
| .. | ||
| _contact.html.haml | ||
| _features.html.haml | ||
| _forms.html.haml | ||
| _links.html.haml | ||
| _registration.html.haml | ||
| more.html.haml | ||
| show.html.haml | ||
| terms.html.haml | ||