Mercurial > prosody-hg
diff plugins/mod_mam/mod_mam.lua @ 8015:ecb110f45c92
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parents | 42dd766cfe97 |
| children | eb9784561387 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parents | 42dd766cfe97 |
| children | eb9784561387 |