Software / code / prosody
Diff
prosodyctl @ 7808:0494bf73dfee
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 04 Jan 2017 10:53:16 +0100 |
| parent | 7686:8d6f367bed8c |
| child | 7923:81f3068fc30c |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 04 Jan 2017 10:53:16 +0100 |
| parent | 7686:8d6f367bed8c |
| child | 7923:81f3068fc30c |