diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-28 19:33:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 19:33:15 +0200 |
| commit | 2f83ffa1bd1a80567c512db79273dc75d32ef069 (patch) | |
| tree | 69cd5f99ace6fbf0118bd46c504b18ba6edef232 /app/models/block.rb | |
| parent | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (diff) | |
| parent | 56d8faab1856f9cff8520518a145b256e7799c36 (diff) | |
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/block.rb')
0 files changed, 0 insertions, 0 deletions