diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-07-01 15:19:05 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-07-01 15:19:05 -0700 |
| commit | 7057984831b2a96980871476686273f8591f8101 (patch) | |
| tree | 54c92d95ffb368570c041d48e45c68c1d3fe3e6d /conn_tests/testconfig.ini | |
| parent | 774e0f2022f1ee318dc57c0008ea6cf1ddadce29 (diff) | |
| parent | 2a2ac73845ffc8695e2bc55746f45e1a18d55e6c (diff) | |
| download | slixmpp-7057984831b2a96980871476686273f8591f8101.tar.gz slixmpp-7057984831b2a96980871476686273f8591f8101.tar.bz2 slixmpp-7057984831b2a96980871476686273f8591f8101.tar.xz slixmpp-7057984831b2a96980871476686273f8591f8101.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions