diff options
author | ThibG <thib@sitedethib.com> | 2019-03-27 14:02:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-27 14:02:32 +0100 |
commit | 7535c607f40cb31fbb68c8f416992c3c5fcc929d (patch) | |
tree | 7026413e6cffcfeb4525212dd25adadd17f82d16 /spec/models/block_spec.rb | |
parent | bdf4f56f9a9052668e7cce1ce7863268e03d9c86 (diff) | |
parent | 48230b57d2c62912cf46b78911414d370bdea6bc (diff) |
Merge pull request #968 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/block_spec.rb')
0 files changed, 0 insertions, 0 deletions