mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
proofs_controller.rb |