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)
Participations: Filter out participations without activities.

Closes #956 and #953

See merge request pleroma/pleroma!1246


Trivial merge