Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 4 Jun 2019 15:34:55 +0000 (15:34 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 4 Jun 2019 15:34:55 +0000 (15:34 +0000)
commitab4915edcbf25009ea29cba6bd4fe6758642a40e
tree9429af6f5923c944e85cd8f9d4d2e935c419a360
parentf178a6f3f0d152a5e75c82da08195ee2d7fd3612
parenta3a7178b604d8bc589a8e3ac06abac094cce5e17
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'

Participations: Filter out participations without activities.

Closes #956 and #953

See merge request pleroma/pleroma!1246