Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 28 May 2018 10:39:49 +0000 (12:39 +0200)
committerlain <lain@soykaf.club>
Mon, 28 May 2018 10:39:49 +0000 (12:39 +0200)
commit461f201caae68cd781240fa40f8b6502ba7e57cb
tree344698862dbb47b2021a30dcce16366bd9788e89
parent3ece4a3ebc05ecc00be6f0a8247d8ca819dc8624
parent8216d5e40e31970b450524d39b634a84f6ec415c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop