Commit 5328ddf7 authored by Eugen Rochko's avatar Eugen Rochko

Merge branch 'master' into 'master'

Add entity Conversation for new direct timeline

See merge request !8
parents f8c232fe fe35907b
Pipeline #404 passed with stages
in 20 seconds