mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 06:09:08 +09:00
cd99255698
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
push_controller.rb | ||
salmon_controller.rb | ||
subscriptions_controller.rb |