Mercurial > prosody-hg
diff plugins/mod_mam/mamprefsxml.lib.lua @ 7892:f00943bbf84f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 14 Feb 2017 23:42:11 +0100 |
| parents | 80ee0d9cd56f |
| children | 036c771b842a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 14 Feb 2017 23:42:11 +0100 |
| parents | 80ee0d9cd56f |
| children | 036c771b842a |