summaryrefslogtreecommitdiff
path: root/conn_tests/testconfig.ini
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-02-03 15:23:01 +0100
committerLance Stout <lancestout@gmail.com>2012-02-03 15:23:01 +0100
commit261a501afc55b6f9c6b13d787cad54a9bb2c5d92 (patch)
tree55330c16b392044ed83937ede2ad65025097b5c4 /conn_tests/testconfig.ini
parent4665c5cf1acf22bd3988682c2942ce0c50d897c4 (diff)
parent9a38a101d2ea2d726ee50caeaf67e179c98872b3 (diff)
downloadslixmpp-261a501afc55b6f9c6b13d787cad54a9bb2c5d92.tar.gz
slixmpp-261a501afc55b6f9c6b13d787cad54a9bb2c5d92.tar.bz2
slixmpp-261a501afc55b6f9c6b13d787cad54a9bb2c5d92.tar.xz
slixmpp-261a501afc55b6f9c6b13d787cad54a9bb2c5d92.zip
Merge remote-tracking branch 'whooo/master' into develop
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions