Mercurial > prosody-hg
diff plugins/mod_mam/mamprefsxml.lib.lua @ 9715:7e21ffbf7ca5
Merge 0.11->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 19 Dec 2018 16:54:25 +0000 |
| parents | 036c771b842a |
| children | d41ce505cdf9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 19 Dec 2018 16:54:25 +0000 |
| parents | 036c771b842a |
| children | d41ce505cdf9 |