comparison plugins/muc/occupant.lib.lua @ 9614:7d1dbacda48a

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 09 Nov 2018 23:15:37 +0100
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
9610:ca000dcd4c06 9614:7d1dbacda48a