mirror of https://github.com/tootsuite/mastodon
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
|---|---|---|
| .. | ||
| applications | ||
| deletes | ||
| exports | ||
| featured_tags | ||
| flavours | ||
| identity_proofs | ||
| imports | ||
| migrations | ||
| preferences | ||
| profiles | ||
| shared | ||
| two_factor_authentication | ||
| two_factor_authentications | ||