diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-10-26 23:30:15 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-10-26 23:30:15 +0000 |
commit | f0b9e5befac2aef2c57d68d1441faed693bacea6 (patch) | |
tree | 6b0f9746afaa3356db58aa3a7ef0cc533bd87d04 /plugins/mod_welcome.lua | |
parent | 493cfc98173579fe924d06b353cf5416471dec1c (diff) | |
parent | c73ece03d8efcc4b46712ff32b7da610cb21dc4f (diff) | |
download | prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.tar.gz prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.zip |
Merge with trunk
Diffstat (limited to 'plugins/mod_welcome.lua')
-rw-r--r-- | plugins/mod_welcome.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua index cc50cba3..edcfbd8c 100644 --- a/plugins/mod_welcome.lua +++ b/plugins/mod_welcome.lua @@ -7,7 +7,7 @@ -- local host = module:get_host(); -local welcome_text = module:get_option("welcome_message") or "Hello $user, welcome to the $host IM server!"; +local welcome_text = module:get_option("welcome_message") or "Hello $username, welcome to the $host IM server!"; local st = require "util.stanza"; |