Merge "cli: Display correct unit for HTTP timeout in "manager show settings"."
authorJoshua Colp <jcolp@digium.com>
Wed, 16 May 2018 18:56:48 +0000 (13:56 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 May 2018 18:56:48 +0000 (13:56 -0500)
1  2 
main/manager.c

diff --cc main/manager.c
Simple merge