Glitch-Shrike/app/views/settings
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
aliases
applications
deletes
exports
featured_tags
flavours
identity_proofs
imports
migration/redirects Add (back) option to set redirect notice on account without moving followers (#11994) 2019-09-29 05:03:19 +02:00
migrations Add (back) option to set redirect notice on account without moving followers (#11994) 2019-09-29 05:03:19 +02:00
preferences
profiles Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
shared
two_factor_authentication
two_factor_authentications