]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d199060 85b8631)
Merge pull request #154 in FS/freeswitch from ~SPDITNER/freeswitch-fs-7136:master...
authorMike Jerris <mike@jerris.com>
Fri, 9 Jan 2015 17:47:09 +0000 (11:47 -0600)
committerMike Jerris <mike@jerris.com>
Fri, 9 Jan 2015 17:47:09 +0000 (11:47 -0600)
* commit '85b8631d621f71a5345bc00627f938eb85ffef03':
  Add conference member data to floor event


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