diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-31 20:56:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 20:56:22 +0200 |
| commit | fd2c7aa8ec2ee00c62d76887ee3b597c8462049d (patch) | |
| tree | 7f988360fd5b6aefa1ddd4255926bb20025fd27f /app/models/conversation.rb | |
| parent | c6942a528332e99b605efa95ffa1c710324d368c (diff) | |
| parent | 6f75a9001f6ba8e47c80767d8406cfeb11a79690 (diff) | |
Merge pull request #694 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/conversation.rb')
0 files changed, 0 insertions, 0 deletions