Diff

plugins/muc/occupant.lib.lua @ 8148:472219f85df6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 18 May 2017 02:01:20 +0200 (2017-05-18)
parent 7086:6cc7c9da29ed
child 12977:74b9e05af71e
line wrap: on
line diff