Merge branch 'develop' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 28 Jul 2019 20:25:35 +0000 (20:25 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 28 Jul 2019 20:25:35 +0000 (20:25 +0000)
commit488c06b6f5d09111733c208bd1187b91297aa9ab
tree9c3188bffc1c9dd65c067923cf65653d6d9fa3c2
parentf78390ffdf206cc2a1c7fe3c0b9ad67cd608ce00
parent961e7785314688b9e2445649c71e12023a982165
Merge branch 'develop' into 'develop'

Fix HTTP sig tweak on KeyId

See merge request pleroma/pleroma!1496