]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19233e4 d5d4517)
Merge pull request #447 in FS/freeswitch from bugfix/FS-7911-v1.4 to v1.4
authorMike Jerris <mike@jerris.com>
Tue, 1 Sep 2015 18:06:25 +0000 (13:06 -0500)
committerMike Jerris <mike@jerris.com>
Tue, 1 Sep 2015 18:06:25 +0000 (13:06 -0500)
* commit 'd5d451734047a7dd6f847f6bd875f4a73c0d011d':
  FS-7912: [mod_conference] fix for v1.4 branch to not allocate for conference cdr if conference cdr is disabled


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