mirror of https://github.com/tootsuite/mastodon
1c448d6474
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream. |
||
|---|---|---|
| .. | ||
| assets | ||
| devise | ||
| generators | ||
| mastodon | ||
| paperclip | ||
| tasks | ||
| templates | ||
| cli.rb | ||