]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
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)
commitdd5c4a539cc741eed28cfc8dd8b485a6bdd38906
tree20d2d5e9bfcc37b2a814bd487f9143de0c4a8fdc
parent2475c2686f0757bad4039bc6da4782ff5a5b6742
parent05cc7708188fa040dcb903cdcdae28990fa177a8
Merge pull request #865 in FS/freeswitch from ~MZAKA/freeswitch:feature/FS-9192-proxy-hold to master

* commit '05cc7708188fa040dcb903cdcdae28990fa177a8':
  FS-9192-proxy-hold: proxy hold when proxy media and proxy mode are disabled; its similiar to proxy-refer