Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 06 Feb 2014 10:55:09 +0100
changeset 6011 a35c9e52b02e
parent 6008 e6f735c62c5d (current diff)
parent 6010 fad7084a0b35 (diff)
child 6018 4a276653a2c9
Merge 0.10->trunk
--- a/plugins/mod_motd.lua	Mon Feb 03 07:25:05 2014 +0100
+++ b/plugins/mod_motd.lua	Thu Feb 06 10:55:09 2014 +0100
@@ -15,7 +15,7 @@
 
 local st = require "util.stanza";
 
-motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config
+motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n[ \t]+", "\n"); -- Strip indentation from the config
 
 module:hook("presence/bare", function (event)
 		local session, stanza = event.origin, event.stanza;
prosody