diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-21 17:51:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-21 17:51:06 +0200 |
| commit | 162f1863a74efdbd2912fef671338c545721742c (patch) | |
| tree | 9ed60f78e2e8acc823bccb7c75ecaa3fdb1b7ab6 /spec/models/block_spec.rb | |
| parent | 98ecadbf99aa823164608f796a40ab1cd067bdc2 (diff) | |
| parent | a4c9bda771c04526005f708dfb9ca2ccced60d52 (diff) | |
Merge pull request #499 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/block_spec.rb')
0 files changed, 0 insertions, 0 deletions