Merge branch 'fix/Upload_base_url' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)
commitacd20914ec5a2cedfcd6a7405a22b6453d951164
treeb0a7fa03d0522e7b6ae243bb62b750fcb653fb6b
parent7286cdff7a1487e79ee48b572fe6888542b1dfbd
parent84fca14c3c6b3a5a6f3b0894903867dfa50a78bb
Merge branch 'fix/Upload_base_url' into 'develop'

Fix/upload base url

See merge request pleroma/pleroma!1484