mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
account_batch.rb | ||
admin_settings.rb | ||
challenge.rb | ||
custom_emoji_batch.rb | ||
delete_confirmation.rb | ||
redirect.rb | ||
status_batch.rb | ||
tag_batch.rb | ||
two_factor_confirmation.rb |