# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1601929195 -7200
# Node ID a5acd6354845d389e1730f6fcf969300b65c1f6e
# Parent  2187643b8e2048870b4c11a41bc2e6ef0167c48f# Parent  e17b98feb0b7cad6539ee25c5cc7728911349a6d
Merge 0.11->trunk

diff -r 2187643b8e20 -r a5acd6354845 plugins/muc/subject.lib.lua
--- a/plugins/muc/subject.lib.lua	Mon Oct 05 21:54:17 2020 +0200
+++ b/plugins/muc/subject.lib.lua	Mon Oct 05 22:19:55 2020 +0200
@@ -31,10 +31,10 @@
 
 module:hook("muc-disco#info", function (event)
 	table.insert(event.form, {
-		name = "muc#roominfo_changesubject";
+		name = "muc#roomconfig_changesubject";
 		type = "boolean";
 	});
-	event.formdata["muc#roominfo_changesubject"] = get_changesubject(event.room);
+	event.formdata["muc#roomconfig_changesubject"] = get_changesubject(event.room);
 end);
 
 module:hook("muc-config-form", function(event)
diff -r 2187643b8e20 -r a5acd6354845 util/dependencies.lua