You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
challenges_controller.rb	…
confirmations_controller.rb	…
omniauth_callbacks_controller.rb	…
passwords_controller.rb	…
registrations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
sessions_controller.rb	…
setup_controller.rb	…