about summary refs log tree commit diff
path: root/app/controllers/settings/profiles_controller.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-06-30 11:13:38 +0200
committerGitHub <noreply@github.com>2021-06-30 11:13:38 +0200
commitf4b9d94ce78761eb93c34333cbce5730da9ea97f (patch)
tree3b89fc96b9bb005a45955dc057e9a78f00051dd0 /app/controllers/settings/profiles_controller.rb
parenta4c828f8e73672ee344ab234ef11b173d44e1fdb (diff)
parent81d8a20a8895406ca62e43376485c70df4f343c3 (diff)
Merge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/profiles_controller.rb')
0 files changed, 0 insertions, 0 deletions