diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-14 23:30:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 23:30:05 +0200 |
| commit | b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a (patch) | |
| tree | 8ff7cc88e6875952250a9c099842da4909226906 /spec/models/block_spec.rb | |
| parent | e1d282023432ff4a88cb795f3a9889704314e448 (diff) | |
| parent | 2b75728a8083d07bc3238b7aef21ceb3b2cc6e7f (diff) | |
Merge pull request #1329 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/block_spec.rb')
0 files changed, 0 insertions, 0 deletions