]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dbc070 d3985ee)
Merge "cli: Display correct unit for HTTP timeout in "manager show settings"." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 16 May 2018 15:03:13 +0000 (10:03 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 May 2018 15:03:14 +0000 (10:03 -0500)
1  2 
main/manager.c patch | diff1 | diff2 | blob | history

diff --cc main/manager.c
Simple merge
Mirror of https://github.com/asterisk/asterisk.git