mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 15:34:55 +00:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
activitypub | ||
account_relationships_presenter.rb | ||
initial_state_presenter.rb | ||
instance_presenter.rb | ||
status_relationships_presenter.rb |