Diff

plugins/muc/lock.lib.lua @ 7972:c29de6820fbb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 11 Mar 2017 17:51:02 +0100 (2017-03-11)
parent 7408:cf53081ce767
child 7999:980606856882
line wrap: on
line diff