Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 2 Jun 2018 13:39:21 +0000 (15:39 +0200)
committerlain <lain@soykaf.club>
Sat, 2 Jun 2018 13:39:21 +0000 (15:39 +0200)
commitda9cbf2c05124377586f370cb716943211f51052
tree82ccc8ee824b64851867af89227d8421a1da1dd4
parent5e76adb07e225a1f5934b44ad474158dfcd52233
parentdca1d6d16278599485df3a175fb356bdc995441c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop