mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 13:04:59 +00:00
16d5217502
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
api | ||
auth | ||
concerns | ||
oauth | ||
settings | ||
well_known | ||
about_controller_spec.rb | ||
account_follow_controller_spec.rb | ||
account_unfollow_controller_spec.rb | ||
accounts_controller_spec.rb | ||
application_controller_spec.rb | ||
authorize_follows_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
home_controller_spec.rb | ||
manifests_controller_spec.rb | ||
media_controller_spec.rb | ||
remote_follow_controller_spec.rb | ||
statuses_controller_spec.rb | ||
stream_entries_controller_spec.rb | ||
tags_controller_spec.rb |