mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 07:32:09 +00:00
ed490b781f
Conflicts: Gemfile.lock config/application.rb |
||
---|---|---|
.. | ||
v1 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
push_controller.rb | ||
salmon_controller.rb | ||
subscriptions_controller.rb |