Diff

plugins/muc/mod_muc.lua @ 7269:cde4ef90cf3d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 11 Mar 2016 13:41:10 +0100
parent 7246:80923a1a8fe1
parent 7266:f0a2a305b788
child 7350:24e2369b67f9
line wrap: on
line diff