Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)
committerlain <lain@soykaf.club>
Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)
commit762f6edc29a7a48e3a663e9bedec58e0036ff363
tree86ea0a0f8afc2b825115e9abb0b42554562f8f8b
parent12f0ad139267c9945f49c3f31dc6d454406bab7e
parent11a1241d41a166714aca22afff6f540a11d642aa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop