Update UI before generating OTR key
Update UI before generating OTR key
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/muc_roles' into muc_roles
Merge branch 'master' into muc_roles