Mercurial > prosody-hg
diff plugins/mod_mam/mamprefsxml.lib.lua @ 8707:fd39c44c0113
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Apr 2018 18:42:05 +0100 |
| parents | 036c771b842a |
| children | d41ce505cdf9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Apr 2018 18:42:05 +0100 |
| parents | 036c771b842a |
| children | d41ce505cdf9 |