From: Jenkins2 <jenkins2@gerrit.asterisk.org>
Date: Wed, 16 May 2018 15:03:13 +0000 (-0500)
Subject: Merge "cli: Display correct unit for HTTP timeout in "manager show settings"." into 15
X-Git-Tag: 15.5.0-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87eaea2107877a53e87906d64abf78a1ae1b1df;p=thirdparty%2Fasterisk.git

Merge "cli: Display correct unit for HTTP timeout in "manager show settings"." into 15
---

b87eaea2107877a53e87906d64abf78a1ae1b1df