From: Mike Jerris <mike@jerris.com>
Date: Wed, 25 Jul 2018 19:26:37 +0000 (+0000)
Subject: Merge pull request #1355 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:feature... 
X-Git-Tag: v1.8.2~1^2~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b5a514ba494ea4e0682bf3fcbca14256223962a;p=thirdparty%2Ffreeswitch.git

Merge pull request #1355 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:feature/FS-10554-add-conference-api-command-vid-res-id-force to master

* commit 'cc084c9fb461a9180eeda0f428f0dbeac59db143':
  FS-10554: Refactor conference vid-res-id command, add 'force' option
---

4b5a514ba494ea4e0682bf3fcbca14256223962a