Merge branch 'feature/custom-fields' into 'develop'
authorlain <lain@soykaf.club>
Tue, 20 Aug 2019 12:44:14 +0000 (12:44 +0000)
committerlain <lain@soykaf.club>
Tue, 20 Aug 2019 12:44:14 +0000 (12:44 +0000)
commitef43016b2c03f02ed6d77c6ca4afb1f19ff04771
tree01566e4988a6948104d109ca3b7b70d8598a4db5
parent10696ce2eede57d256e6a1b6f4775037fd63b146
parenta2e1db56323d0f306ee42a1f58471eb55c8c1e68
Merge branch 'feature/custom-fields' into 'develop'

Add custom profile fields

See merge request pleroma/pleroma!1488
CHANGELOG.md
lib/pleroma/html.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex