diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-07 22:44:12 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-07 22:44:12 +0100 |
commit | b0eec64a3f56ee4020f2d328e6d51a07f45cab53 (patch) | |
tree | aecd89ed33910dfc20d71cdcdece8d1c72673efa /doc/roster_format.txt | |
parent | 6403594a10e820f81e9bdffed95d947b7350cca9 (diff) | |
parent | 255423ab565b6c7f8653159ac6852deac16d2a48 (diff) | |
download | prosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.tar.gz prosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions