summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-18 11:56:39 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-18 11:56:45 +0100
commit4e14b6b6fe22011c01cf6ec9fad8f3536b288d13 (patch)
tree8da5b8a3e50c2004976444a3d04411d2a02da632 /README.md
parent5778652ada0763deb6a61479b2410e1f68542ce9 (diff)
parent79f3f76ac60e656683a2ef8ac4e82bc64d742337 (diff)
downloadqtwebsockets-4e14b6b6fe22011c01cf6ec9fad8f3536b288d13.tar.gz
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions