Software / code / prosody
Diff
prosodyctl @ 7460:726b088f9408
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 24 Jun 2016 15:11:06 +0200 |
| parent | 7455:82d8c11ab0cb |
| child | 7456:76a8456cf1e2 |
| child | 7483:8c5320a4bfaf |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 24 Jun 2016 15:11:06 +0200 |
| parent | 7455:82d8c11ab0cb |
| child | 7456:76a8456cf1e2 |
| child | 7483:8c5320a4bfaf |