diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-12-19 16:54:25 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-12-19 16:54:25 +0000 |
| commit | d64fdd5dc8c23840b6315540f0cd24adce43eb9f (patch) | |
| tree | e73d34807b3d4f301fd5210f78b8e6445f53c461 | |
| parent | ab1ba79466e65013077dd9648a868359cc5b42b8 (diff) | |
| parent | 48deed19d653823106977381498249d134345d70 (diff) | |
| download | prosody-d64fdd5dc8c23840b6315540f0cd24adce43eb9f.tar.gz prosody-d64fdd5dc8c23840b6315540f0cd24adce43eb9f.zip | |
Merge 0.11->trunk
| -rw-r--r-- | spec/scansion/muc_members_only_change.scs | 2 | ||||
| -rw-r--r-- | spec/scansion/muc_members_only_deregister.scs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/scansion/muc_members_only_change.scs b/spec/scansion/muc_members_only_change.scs index 3f9dbeee..dc40b5a0 100644 --- a/spec/scansion/muc_members_only_change.scs +++ b/spec/scansion/muc_members_only_change.scs @@ -1,4 +1,4 @@ -# MUC: Room registration and reserved nicknames +# MUC: Members-only rooms kick members who lose affiliation [Client] Romeo jid: user@localhost diff --git a/spec/scansion/muc_members_only_deregister.scs b/spec/scansion/muc_members_only_deregister.scs index e9a42322..dcc84146 100644 --- a/spec/scansion/muc_members_only_deregister.scs +++ b/spec/scansion/muc_members_only_deregister.scs @@ -1,4 +1,4 @@ -# MUC: Room registration and reserved nicknames +# MUC: Members-only rooms kick members who deregister [Client] Romeo jid: user@localhost |