]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3dbf25 f251464)
Merge pull request #448 in FS/freeswitch from bugfix/FS-7911-master to master
authorMike Jerris <mike@jerris.com>
Tue, 1 Sep 2015 18:06:12 +0000 (13:06 -0500)
committerMike Jerris <mike@jerris.com>
Tue, 1 Sep 2015 18:06:12 +0000 (13:06 -0500)
* commit 'f2514644e1b9964bc4a2f91b8cbe6f8aedf1214b':
  FS-7911: [mod_conference] do not allocate for conference cdr if conference cdr is disabled, and fix leak in conference_record


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