mastodon/app/views/auth
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
challenges
confirmations
passwords Add client-side validation in password change forms (#14564) 2020-08-12 12:11:15 +02:00
registrations Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
sessions Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
setup
shared