aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_mam
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-15 02:27:43 +0200
committerKim Alvefur <zash@zash.se>2017-04-15 02:27:43 +0200
commitc9db076c158fec5a67bc3830a3fb7718cbd61c54 (patch)
tree3d260468008647fb5c3339b9fbbba5b2edc51610 /plugins/mod_mam
parentd64532bd722c65d12ba3f1e76c266fdbe921fe8a (diff)
parent2e1a6cd73ece566c4ebaf76b0b997e7fddf67fd6 (diff)
downloadprosody-c9db076c158fec5a67bc3830a3fb7718cbd61c54.tar.gz
prosody-c9db076c158fec5a67bc3830a3fb7718cbd61c54.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
0 files changed, 0 insertions, 0 deletions