mirror of
https://github.com/funamitech/mastodon
synced 2024-12-02 16:58:53 +09:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
|---|---|---|
| .. | ||
| challenges_controller.rb | ||
| confirmations_controller.rb | ||
| omniauth_callbacks_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||
| setup_controller.rb | ||