diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-23 10:01:10 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-23 10:01:10 -0400 |
commit | 393259c24b017a9005a16338e3297da5c79e9b9a (patch) | |
tree | 012572a0f00b0404eff4e33273e773e5dd92b6a1 /examples/config.xml | |
parent | 756c4c032f820285455c7c57e4925887f9c8e213 (diff) | |
parent | f2449009d197e8e6f29caff6b78a9c9c87ae2909 (diff) | |
download | slixmpp-393259c24b017a9005a16338e3297da5c79e9b9a.tar.gz slixmpp-393259c24b017a9005a16338e3297da5c79e9b9a.tar.bz2 slixmpp-393259c24b017a9005a16338e3297da5c79e9b9a.tar.xz slixmpp-393259c24b017a9005a16338e3297da5c79e9b9a.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'examples/config.xml')
0 files changed, 0 insertions, 0 deletions