summaryrefslogtreecommitdiff
path: root/conn_tests/testconfig.ini
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-20 16:27:25 -0700
committerLance Stout <lancestout@gmail.com>2011-06-20 16:27:25 -0700
commit774e0f2022f1ee318dc57c0008ea6cf1ddadce29 (patch)
tree578eb962a707b5a60dfc503449829515bdc0cf54 /conn_tests/testconfig.ini
parentd1e12cd46fffb56bc7fbe9f1043d01f714356722 (diff)
parentd8d9e8df16c07bd13bbac72e4445a2930407b244 (diff)
downloadslixmpp-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