Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma...
authorlain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:43 +0000 (14:10 +0200)
committerlain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:43 +0000 (14:10 +0200)
commit5d871173d189a0019fda0ee76f8a324d90a163ee
treec3e423993ff5289dd0ba73a94881bd52d9cda1c2
parent037fefe21871ee0a1926286c87c334ea1d339394
parentaac48d0cc6893c231c88d5cd7fe0334353bbf299
Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations