Software / code / prosody
Diff
CHANGES @ 7822:4caaa0c185f1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 13 Jan 2017 18:30:18 +0100 |
| parent | 7373:9b37aaea68e9 |
| parent | 7821:0dea440bdd46 |
| child | 7857:db48b1697234 |
line wrap: on
line diff