diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 15:34:53 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 15:34:53 +0200 |
| commit | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (patch) | |
| tree | 2f208eadf18d1c07122b9fe5a6149a62f02fb372 /app/models/conversation.rb | |
| parent | d17844e6d1ad700df0f704972e2ce16e8693d33b (diff) | |
| parent | 770e33749759e46444106098dd8295f3bac5bd52 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/conversation.rb')
0 files changed, 0 insertions, 0 deletions