Mercurial > prosody-hg
diff plugins/mod_mam/mamprefsxml.lib.lua @ 7967:95e16696ef8a
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 07 Mar 2017 22:44:12 +0100 |
| parents | 036c771b842a |
| children | d41ce505cdf9 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 07 Mar 2017 22:44:12 +0100 |
| parents | 036c771b842a |
| children | d41ce505cdf9 |