diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-08 18:17:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 18:17:22 +0200 |
| commit | fc2f7ee8710b498c4533e229aff6391396aa7213 (patch) | |
| tree | 9576b254773166a419b932c50e8f4d354bea73c3 /app/serializers/rest/conversation_serializer.rb | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 63837a4b781ad27a4af895b0c983d4aff57d80e3 (diff) | |
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/conversation_serializer.rb')
0 files changed, 0 insertions, 0 deletions