diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-03-31 13:25:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-31 13:25:15 +0200 |
commit | b7ec2a900251410c65ba214b50c1657209285b07 (patch) | |
tree | 8b75038d0c2d6a6bc4f8b38de6a13ddc9bedbff0 /app/controllers/about_controller.rb | |
parent | a2a85d5ae03282c6f9cbf452b9b8f7d948a9f380 (diff) | |
parent | 15efa32cca5c2d7dfc32b101a38081add1b3af40 (diff) |
Merge pull request #1517 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/about_controller.rb')
0 files changed, 0 insertions, 0 deletions