mirror of https://github.com/tootsuite/mastodon
b61c3ddff8
Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged. |
||
---|---|---|
.. | ||
challenges_controller.rb | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb | ||
setup_controller.rb |