Mercurial > prosody-modules
diff mod_mam/mamprefsxml.lib.lua @ 1645:9a862059bd97
Merge
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 02 Apr 2015 18:51:13 -0700 |
| parents | 18349533c44d |
| children | dfa9c0cdd960 |
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 02 Apr 2015 18:51:13 -0700 |
| parents | 18349533c44d |
| children | dfa9c0cdd960 |