diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-19 16:19:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 16:19:00 +0100 |
| commit | aae088aaf0d5de542d917d11b7b2e86047645dd7 (patch) | |
| tree | a4a58bba9c294d0c3ed0ea5c6c54e3bfa0507263 /app/services/block_service.rb | |
| parent | 655da1be2029cecedcaf86479938d7805e72107d (diff) | |
| parent | 222865584842de9c2bd3f47737e9ccf6aa8eac93 (diff) | |
Merge pull request #865 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/block_service.rb')
0 files changed, 0 insertions, 0 deletions