Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 2 Apr 2018 13:29:05 +0000 (15:29 +0200)
committerlain <lain@soykaf.club>
Mon, 2 Apr 2018 13:29:05 +0000 (15:29 +0200)
commit96007753ad099b43fcea33662e22b5528426849d
treed403b3282ce8152987e8a507f6dd5befa4d7a6f8
parent360c51f1f52c48e52fd4fe5ccc0be9dd2b47c59f
parent807d243c64e6cc481f465e4b54fada0f2f66cb9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop