Mercurial > prosody-modules
diff mod_webpresence/mod_webpresence.lua @ 1322:bf6796061037
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 26 Feb 2014 20:17:13 +0100 |
parents | 432dc4056114 |
children | 9a1b3f0d0939 |
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 26 Feb 2014 20:17:13 +0100 |
parents | 432dc4056114 |
children | 9a1b3f0d0939 |