Merge branch 'backport/custom-field-update' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Sun, 6 Oct 2019 15:33:33 +0000 (15:33 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 6 Oct 2019 15:33:33 +0000 (15:33 +0000)
Backport: custom field update

See merge request pleroma/pleroma!1805


Trivial merge