David Baker 0a6664493a Merge branch 'master' into pushers 10 gadi atpakaļ
..
unjingle d8b35250a5 Remove editor junk 10 gadi atpakaļ
jitsimeetbridge.py bdc21e7282 convert to spaces before I start a holy war 10 gadi atpakaļ
syweb-jitsi-conference.patch 48f90036d8 Add non-working jitsi meet bridge 10 gadi atpakaļ