Mercurial > prosody-modules
diff mod_mam/mod_mam.lua @ 1641:1fa25cfb0ad4
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 31 Mar 2015 18:31:13 +0200 |
| parents | 3ac2b835c7b3 |
| children | 9ee56cc1be2c |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 31 Mar 2015 18:31:13 +0200 |
| parents | 3ac2b835c7b3 |
| children | 9ee56cc1be2c |