diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-03-24 09:36:26 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-03-24 09:36:26 -0400 |
| commit | d9be51b2efcdaaf6b62488700eb3ce859bb0958a (patch) | |
| tree | bd0283a9b25e3c15c4127fd352071a677c049149 /conn_tests/testconfig.ini | |
| parent | 393259c24b017a9005a16338e3297da5c79e9b9a (diff) | |
| parent | a3d111be12144d9dea80165d84cd8168714d3d54 (diff) | |
| download | slixmpp-d9be51b2efcdaaf6b62488700eb3ce859bb0958a.tar.gz slixmpp-d9be51b2efcdaaf6b62488700eb3ce859bb0958a.tar.bz2 slixmpp-d9be51b2efcdaaf6b62488700eb3ce859bb0958a.tar.xz slixmpp-d9be51b2efcdaaf6b62488700eb3ce859bb0958a.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions