]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 175ad35 1145297)
Merge pull request #1035 in FS/freeswitch from ~CRIENZO/freeswitch:fs-9696 to master
authorMike Jerris <mike@jerris.com>
Fri, 11 Nov 2016 21:35:15 +0000 (15:35 -0600)
committerMike Jerris <mike@jerris.com>
Fri, 11 Nov 2016 21:35:15 +0000 (15:35 -0600)
* commit '11452979f6da94b515ee9b712a33d9957925a7d8':
  FS-9696 keep pickup endpoint up if another endpoint in dialstring hangs up and leg_timeout is set on the pickup endpoint


Trivial merge
Mirror of https://github.com/signalwire/freeswitch.git