comparison plugins/muc/occupant.lib.lua @ 8349:2342eccf4a88

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 25 Oct 2017 01:32:30 +0200
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
8346:a567a646cf21 8349:2342eccf4a88