summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-29 01:00:55 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-29 01:01:12 +0100
commit6f44c40f18397e6656079a196ff4ce36d7563ec7 (patch)
tree3e604f3f4bcf4aab2bf0df6adccb456b1e4ae8e2 /src/network/ssl/qsslsocket.cpp
parent9109461809f2d1ff5bb9d26dccce6d6a5434926b (diff)
parenta3fc03c13032b779f74ef496977d2e19e415227a (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
0 files changed, 0 insertions, 0 deletions