diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-20 16:27:25 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-20 16:27:25 -0700 |
| commit | 774e0f2022f1ee318dc57c0008ea6cf1ddadce29 (patch) | |
| tree | 578eb962a707b5a60dfc503449829515bdc0cf54 /conn_tests/testconfig.ini | |
| parent | d1e12cd46fffb56bc7fbe9f1043d01f714356722 (diff) | |
| parent | d8d9e8df16c07bd13bbac72e4445a2930407b244 (diff) | |
| download | slixmpp-774e0f2022f1ee318dc57c0008ea6cf1ddadce29.tar.gz slixmpp-774e0f2022f1ee318dc57c0008ea6cf1ddadce29.tar.bz2 slixmpp-774e0f2022f1ee318dc57c0008ea6cf1ddadce29.tar.xz slixmpp-774e0f2022f1ee318dc57c0008ea6cf1ddadce29.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions