diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-08-27 17:34:07 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-08-27 17:34:07 (GMT) |
commit | 7f931ab66d8294a20267f1008540532828ab0d20 (patch) | |
tree | c6bd3a2a33ac0f099b1624db5f0ec7831d71dc22 /Swiften/Network/ProxyProvider.cpp | |
parent | 8da2a30bab8640944de750abd1ba26f8543f12ca (diff) | |
parent | 8dbae452004e7bc3c3a6e855f365b9bb348e8f2d (diff) | |
download | swift-7f931ab66d8294a20267f1008540532828ab0d20.zip swift-7f931ab66d8294a20267f1008540532828ab0d20.tar.bz2 |
Merge branch 'swift-1.x'
* swift-1.x:
Update last used certificate file correctly.
Mark JIDs with empty domains as invalid when StringPrep cache is disabled.
Added StringPrep unit test.
Diffstat (limited to 'Swiften/Network/ProxyProvider.cpp')
0 files changed, 0 insertions, 0 deletions