Merge branch 'refactor/user' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 03:00:38 +0000 (03:00 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 26 Sep 2019 03:00:38 +0000 (03:00 +0000)
commit48a82c46096a560fe9331a63f19ace6faaf98c3d
tree02c6216dbcb3814115aa64de0ef5a171121b527e
parent59ae9255fbf7abd6efe46799b19c094724f5d51b
parent035f22f7849815c5f77a734c56f409c0f08ac853
Merge branch 'refactor/user' into 'develop'

Simplify updating user's `info`

See merge request pleroma/pleroma!1712
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex