Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Thu, 19 Apr 2018 19:44:29 +0000 (21:44 +0200)
committerlain <lain@soykaf.club>
Thu, 19 Apr 2018 19:44:29 +0000 (21:44 +0200)
commit193be32f45df3194c5cfa99f98cfc6900282d368
treea3460be964f9b60a5e40b7a69d2570b2bc18d85a
parent0b4ff1bfe273f89880c1ef02e9e39dddcf7bcf50
parent3f7b02e7c4570681f965827888cba65b2a319f03
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop