diff options
author | Lance Stout <lancestout@gmail.com> | 2011-08-03 18:35:01 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-08-03 18:35:01 -0700 |
commit | 9591cd3a7e94a663675d97b1db93c2c585d948dc (patch) | |
tree | b9e067447d7a269651b0b4e60fc7255b127aed79 /examples/config.xml | |
parent | db92fa23303f1115ef8bf938efb6d686d9c3fa0a (diff) | |
parent | afeb8a679a9895726eea5669b73c83d57bb03dff (diff) | |
download | slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.gz slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.bz2 slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.xz slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.zip |
Merge branch 'stream_features' into develop
Diffstat (limited to 'examples/config.xml')
0 files changed, 0 insertions, 0 deletions