Merge branch 'credo/version-bump-1.1.5' into 'develop'
authorlain <lain@soykaf.club>
Mon, 20 Jan 2020 14:42:43 +0000 (14:42 +0000)
committerlain <lain@soykaf.club>
Mon, 20 Jan 2020 14:42:43 +0000 (14:42 +0000)
Bump credo to 1.1.5

See merge request pleroma/pleroma!2115

1  2 
lib/pleroma/web/admin_api/admin_api_controller.ex
mix.lock
test/web/admin_api/admin_api_controller_test.exs

diff --cc mix.lock
Simple merge