about summary refs log tree commit diff
path: root/app/models/account_conversation.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-01-20 18:31:11 +0100
committerThibaut Girka <thib@sitedethib.com>2020-01-20 18:31:11 +0100
commitdc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch)
treea828f3968b151924656061bfc709b00565aff877 /app/models/account_conversation.rb
parenteeb8753adc98022a55051d45a137b02a2bff4c23 (diff)
parent02063c245c8a2a09e741cbce8302edf3ec14feef (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
Diffstat (limited to 'app/models/account_conversation.rb')
0 files changed, 0 insertions, 0 deletions