diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-11 14:12:36 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-11 14:12:36 +0200 |
| commit | 8f720be9f3ad314f0c0b0c7c0cc81616ba20e8fd (patch) | |
| tree | 62803c2547eace343e63a06499b8406967836cc0 /app/models/block.rb | |
| parent | a02244f17c841f641c9ed289fb592b73fecf472d (diff) | |
| parent | ac7df62a0441b95ec04fd9111a9394795dd53ff2 (diff) | |
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/block.rb')
0 files changed, 0 insertions, 0 deletions