mastodon/app/views/settings/profiles
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
..
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00