diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 20:53:51 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 20:53:51 +0200 |
commit | 969d04385157175dc9c9f46987976d8fc5771707 (patch) | |
tree | 53e8e98051c24ac4fb32ce5692e241b6a6391de3 /app/models/conversation.rb | |
parent | f3ac4a44110872df8c331319b3c506b966406f6a (diff) | |
parent | 7802ebd5f3de1ef4b7384f24fe5067977aff8da3 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/conversation.rb')
0 files changed, 0 insertions, 0 deletions