Mercurial > prosody-hg
diff plugins/mod_welcome.lua @ 7074:3ff83773ffc0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jan 2016 03:57:17 +0100 |
| parents | bd0ff8ae98a8 |
| children | 9e380d145ad1 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jan 2016 03:57:17 +0100 |
| parents | bd0ff8ae98a8 |
| children | 9e380d145ad1 |