Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Thu, 26 Apr 2018 05:07:04 +0000 (07:07 +0200)
committerlain <lain@soykaf.club>
Thu, 26 Apr 2018 05:07:04 +0000 (07:07 +0200)
commit6eb274f278e2a02fdba244072db8202de4030bf4
treed9d28895aaafec32fb560dcdde69550aeffc6ba2
parent3bad2b827a2e334faad824a3497ee8a77ebc2e74
parent845bd56c9cd51cefcfb909741690aead30141a18
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop