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)
commitf6ff19e0745a2362406ea2b073e7ca85f2121d41
tree23189976f548cc4c56f6162b635d32d3ed62971f
parentb5e6ba323d8a6d6a0440787ee4cdc39c25bdc778
parentc6b79803037a6cc7ebc94c01d54b8b79ccebd281
Merge branch 'backport/custom-field-update' into 'maint/1.1'

Backport: custom field update

See merge request pleroma/pleroma!1805