comparison core/rostermanager.lua @ 9598:dcd85bc34d21

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 30 Oct 2018 19:18:03 +0100
parents 72f0862978ef
children e50559a42dfe fdc2bae50100
comparison
equal deleted inserted replaced
9596:b148dd7e78e3 9598:dcd85bc34d21