Software / code / prosody
Diff
prosodyctl @ 7822:4caaa0c185f1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 13 Jan 2017 18:30:18 +0100 |
| parent | 7686:8d6f367bed8c |
| child | 7923:81f3068fc30c |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 13 Jan 2017 18:30:18 +0100 |
| parent | 7686:8d6f367bed8c |
| child | 7923:81f3068fc30c |