]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
projects / thirdparty / freeswitch.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d7a09b0 ce19889)
Merge pull request #1375 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-10623...
authorMike Jerris <mike@jerris.com>
Tue, 12 Feb 2019 15:14:33 +0000 (15:14 +0000)
committerMike Jerris <mike@jerris.com>
Tue, 12 Feb 2019 15:14:33 +0000 (15:14 +0000)
commitb7df5ac8cf38281f40996347a310f09198fb11d2
tree9abbf780c43d22de938c0559d57d43441f1a4254tree
parentd7a09b08cbe04cf6c3be5b13a97f2ec2b36a06afcommit | diff
parentce198895f1c0f401076370b2f4ec9a9f62d439e9commit | diff
Merge pull request #1375 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-10623 to master

* commit 'ce198895f1c0f401076370b2f4ec9a9f62d439e9':
  FS-10623 [mod_conference] add conference to xml/json list
  FS-10623 [mod_conference] emit conference vars in events and allow setting them in profiles
src/mod/applications/mod_conference/mod_conference.c diff1 | diff2 | blob | history
Mirror of https://github.com/signalwire/freeswitch.git