This reverts commit 88325aeef2. Turns out a conference with a password triggers a failed conference join. It's going to be tricky to decipher when to do actual cleanup, and where to shove that code, so reverting is easier for now.master
|
|
||
377 |
|
377 |
|
378 |
|
378 |
|
379 |
|
379 |
|
380 |
|
|
|
381 |
|
|
|
|
380 |
|
|
382 |
|
381 |
|
383 |
|
382 |
|
384 |
|
383 |
|
385 |
|
|
|
|
384 |
|
|
386 |
|
385 |
|
387 |
|
386 |
|
388 |
|
387 |
|
|
|
||
129 |
|
129 |
|
130 |
|
130 |
|
131 |
|
131 |
|
132 |
|
|
|
133 |
|
|
|
134 |
|
132 |
|
135 |
|
133 |
|
136 |
|
134 |
|
|
|
||
17 |
|
17 |
|
18 |
|
18 |
|
19 |
|
19 |
|
20 |
|
|
|
|
20 |
|
|
21 |
|
21 |
|
22 |
|
22 |
|
23 |
|
23 |
|
|
|
||
144 |
|
144 |
|
145 |
|
145 |
|
146 |
|
146 |
|
147 |
|
|
|
148 |
|
|
|
149 |
|
|
|
150 |
|
|
|
151 |
|
|
|
152 |
|
147 |
|
153 |
|
148 |
|
154 |
|
149 |
|
|
|
||
87 |
|
87 |
|
88 |
|
88 |
|
89 |
|
89 |
|
|
90 |
|
|
90 |
|
91 |
|
91 |
|
92 |
|
92 |
|
93 |
|