Bug 938099 - display conference error when merging or removing
Merge pull request #15109 from Rik/conference-error-938099

Bug 938099 - display conference error when merging or removing r=etienne