Software `/` code `/` prosody

Comparison

prosodyctl @ 7062:90e8bbfbaabd

tests: Fix merge, modulemanager test was removed

author	Kim Alvefur <zash@zash.se>
date	Fri, 08 Jan 2016 16:20:02 +0100
parent	6960:50e2277ea05f
child	7065:4fc3c008976f

comparison

equal deleted inserted replaced

7061:eda0feeaf759	7062:90e8bbfbaabd