diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-04-04 12:01:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-04 12:01:52 +0200 |
commit | af01ab7efebab356e73b498afe4258ae7515cc6a (patch) | |
tree | 798f5cde568987b7641543eb3972f355bae9170b /app/controllers/admin/instances_controller.rb | |
parent | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (diff) | |
parent | d29cf8a044f6c0d004649223e018d240983e8437 (diff) |
Merge pull request #2159 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