diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-28 15:06:56 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-28 15:06:56 +0100 |
commit | a2e7422c44fa376517b143a317b60042b85a8dc9 (patch) | |
tree | f4be8fd8748b09429e518c34024b79b273d76845 /doc/roster_format.txt | |
parent | a50400a3c22434805b4220379070b09930639063 (diff) | |
parent | 29cb6ece54e331e6bed5a042524091f75b43846a (diff) | |
download | prosody-a2e7422c44fa376517b143a317b60042b85a8dc9.tar.gz prosody-a2e7422c44fa376517b143a317b60042b85a8dc9.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions