diff options
author | Kim Alvefur <zash@zash.se> | 2018-09-08 11:51:52 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-09-08 11:51:52 +0200 |
commit | 74fa6ced2119977e22d83a2f16b4817231712f66 (patch) | |
tree | c6632762f9ff0eca0f3bfa294d398f65ceceed63 /doc/roster_format.txt | |
parent | 02b648d54f973e311001509960510da02a76e9c9 (diff) | |
parent | e6797cc6b2ae75965c402eb13f3159ed3337f475 (diff) | |
download | prosody-74fa6ced2119977e22d83a2f16b4817231712f66.tar.gz prosody-74fa6ced2119977e22d83a2f16b4817231712f66.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc/roster_format.txt')
0 files changed, 0 insertions, 0 deletions