Comparison

tools/openfire2prosody.lua @ 7161:8380b595a33b

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Feb 2016 13:49:19 +0000
parent 5776:bd0ff8ae98a8
child 13142:879a6a33c21b
comparison
equal deleted inserted replaced
7159:f11d6c9d1c1f 7161:8380b595a33b