]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2475c26 05cc770)
Merge pull request #865 in FS/freeswitch from ~MZAKA/freeswitch:feature/FS-9192-proxy...
authorMike Jerris <mike@jerris.com>
Wed, 15 Jun 2016 23:38:07 +0000 (18:38 -0500)
committerMike Jerris <mike@jerris.com>
Wed, 15 Jun 2016 23:38:07 +0000 (18:38 -0500)
* commit '05cc7708188fa040dcb903cdcdae28990fa177a8':
  FS-9192-proxy-hold: proxy hold when proxy media and proxy mode are disabled; its similiar to proxy-refer


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