Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorLain Iwakura <lain@soykaf.club>
Tue, 19 Dec 2017 15:15:45 +0000 (16:15 +0100)
committerLain Iwakura <lain@soykaf.club>
Tue, 19 Dec 2017 15:15:45 +0000 (16:15 +0100)
commit2a744cdff8a94d92683ab1a16f89bb51112006f8
treea08e8c27a810972fdc65585bcd08c0a0012d533f
parentf1f79c0dca9198e2a427f988b60e4222f8afda57
parent29c981278911e6b4342f63a566cfc308b59176e7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop