Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts...
authorkPherox <admin@mail.kr-kp.com>
Mon, 30 Sep 2019 16:39:22 +0000 (01:39 +0900)
committerkPherox <admin@mail.kr-kp.com>
Mon, 30 Sep 2019 16:40:33 +0000 (01:40 +0900)
commita0f101ee806af06bcd4271cd8d57d11ff85ea11a
tree2cd3c5d1a645be1395c57ec5616f31afb4b68da7
parent8ca4f145a51e92c9f3a6c374ceddfac22ea300d9
parent7c9b023a918c84b60ae6547289a083c671a3659b
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs