Mercurial > prosody-hg
diff plugins/mod_welcome.lua @ 6083:31b2f82e2d3c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 21:54:44 +0200 |
| parents | bd0ff8ae98a8 |
| children | 9e380d145ad1 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 21:54:44 +0200 |
| parents | bd0ff8ae98a8 |
| children | 9e380d145ad1 |