comparison plugins/muc/occupant.lib.lua @ 9136:07fc2c5c0c2e

Merge jonasw->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Aug 2018 16:58:21 +0200
parents 6cc7c9da29ed
children 74b9e05af71e
comparison
equal deleted inserted replaced
9134:4aa786a180f5 9136:07fc2c5c0c2e