]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "res_pjsip_transport_websocket: Add NULL check in get_write_timeout" into 13
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 14 Jun 2017 20:15:55 +0000 (15:15 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 14 Jun 2017 20:15:56 +0000 (15:15 -0500)

Trivial merge