diff options
author | Kim Alvefur <zash@zash.se> | 2013-11-13 11:59:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-11-13 11:59:43 +0100 |
commit | d8155aef2c5323708f59d95540aafd1824eedcb9 (patch) | |
tree | 35e7e5c860fce3eb29284d9bdeb98bd167cce04f /doc/roster_format.txt | |
parent | 525a4393c735f83b6471941333e4a6ab7483a640 (diff) | |
parent | f454faa15bdbccc23b805dcb110e985cb0ff0295 (diff) | |
download | prosody-d8155aef2c5323708f59d95540aafd1824eedcb9.tar.gz prosody-d8155aef2c5323708f59d95540aafd1824eedcb9.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions