From: Mike Jerris <mike@jerris.com>
Date: Tue, 12 Feb 2019 15:14:33 +0000 (+0000)
Subject: Merge pull request #1375 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-10623... 
X-Git-Tag: v1.8.6~1^2~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7df5ac8cf38281f40996347a310f09198fb11d2;p=thirdparty%2Ffreeswitch.git

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
---

b7df5ac8cf38281f40996347a310f09198fb11d2