Mercurial > prosody-modules
comparison mod_mam_muc_sql/mod_mam_muc_sql.lua @ 1341:f5c256a5f209
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 10 Mar 2014 00:04:00 +0100 |
parents | 87e847280aef |
children | 7dbde05b48a9 |
comparison
equal
deleted
inserted
replaced
1340:3ffd64b4ab59 | 1341:f5c256a5f209 |
---|