Merge branch 'feature/admin-api-render-whole-status' into 'develop'

author feld <feld@feld.me>

Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)

committer feld <feld@feld.me>

Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)
author feld <feld@feld.me>
Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)
committer feld <feld@feld.me>
Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/admin_api/admin_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history