diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-30 11:13:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-30 11:13:58 +0100 |
commit | f3ce9653eb92142d509a76aedd8fe06122d36deb (patch) | |
tree | ec96a12ff97c57a781a3120f38e80a20d3d669f8 /app/controllers/admin/instances_controller.rb | |
parent | 1a7aa37b60769a10077c585fa76ec848b6866d9a (diff) | |
parent | fe111a8badbbb4059451c3f04cbaf79893af4ab0 (diff) |
Merge pull request #1982 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/instances_controller.rb')
0 files changed, 0 insertions, 0 deletions