about summary refs log tree commit diff
path: root/app/models/conversation.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-11-06 15:22:44 +0100
committerThibaut Girka <thib@sitedethib.com>2018-11-06 15:22:44 +0100
commit36dab188fd83876ba5e0e08a4b6647a445e2f24f (patch)
tree28bdd407eac81bfcc2741ad2c1714192d774754a /app/models/conversation.rb
parent34209c0340ca6b7c61de964a17f5f3fe2e0f7c7b (diff)
parent7775225d174bf7c413bcd41b89a5d50d32cc5cee (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/conversation.rb')
0 files changed, 0 insertions, 0 deletions