Merge branch 'develop' into feature/return-link-for-password-reset

author Maxim Filippov <colixer@gmail.com>

Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)

committer Maxim Filippov <colixer@gmail.com>

Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
author Maxim Filippov <colixer@gmail.com>
Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
committer Maxim Filippov <colixer@gmail.com>
Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge
author	Maxim Filippov <colixer@gmail.com>
	Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
committer	Maxim Filippov <colixer@gmail.com>
	Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/admin_api/admin_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history