mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 17:16:41 +00:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
activitypub | ||
nodeinfo | ||
rest | ||
rss | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |