mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-03 03:53:43 +00:00
1c448d6474
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||