aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-12-19 16:54:25 +0000
committerMatthew Wild <mwild1@gmail.com>2018-12-19 16:54:25 +0000
commit38f2458cd7fab0fcdea01c831c0f4276864db051 (patch)
treee73d34807b3d4f301fd5210f78b8e6445f53c461
parent4e5c60fa375f125623fa262f731e4d47f5bcb1b4 (diff)
parentee729847c3e3b6f2d4d8db223c2c42cc24dfdbb1 (diff)
downloadprosody-38f2458cd7fab0fcdea01c831c0f4276864db051.tar.gz
prosody-38f2458cd7fab0fcdea01c831c0f4276864db051.zip
Merge 0.11->trunk
-rw-r--r--spec/scansion/muc_members_only_change.scs2
-rw-r--r--spec/scansion/muc_members_only_deregister.scs2
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