diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-08-21 15:42:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-21 15:42:50 +0200 |
commit | 5a3d09dc8e30198b4d8d921ef0b1ba0a35fe01d9 (patch) | |
tree | da884993bdb5476cd6df5028ecafcaf1a2ba2948 /app/models/block.rb | |
parent | aba0032f540407d88144ac637a59fce69625546f (diff) | |
parent | 8a93dd3d83995a6821bfda88c28204dcee1461e8 (diff) |
Merge pull request #1826 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/block.rb')
0 files changed, 0 insertions, 0 deletions