Merge pull request #1514 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-11134...

author Mike Jerris <mike@jerris.com>

Tue, 12 Feb 2019 16:22:08 +0000 (16:22 +0000)

committer Mike Jerris <mike@jerris.com>

Tue, 12 Feb 2019 16:22:08 +0000 (16:22 +0000)
author Mike Jerris <mike@jerris.com>
Tue, 12 Feb 2019 16:22:08 +0000 (16:22 +0000)
committer Mike Jerris <mike@jerris.com>
Tue, 12 Feb 2019 16:22:08 +0000 (16:22 +0000)
diff --cc src/mod/applications/mod_conference/conference_api.c
Simple merge
diff --cc src/mod/applications/mod_conference/mod_conference.c
Simple merge
diff --cc src/mod/applications/mod_conference/mod_conference.h
Simple merge
author	Mike Jerris <mike@jerris.com>
	Tue, 12 Feb 2019 16:22:08 +0000 (16:22 +0000)
committer	Mike Jerris <mike@jerris.com>
	Tue, 12 Feb 2019 16:22:08 +0000 (16:22 +0000)
		1	2
src/mod/applications/mod_conference/conference_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/applications/mod_conference/mod_conference.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/applications/mod_conference/mod_conference.h	patch \|	diff1 \|	diff2 \|	blob \| history