summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-31 11:55:59 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-31 11:55:59 +0100
commit1089546e8c47b59b42356d1c75651d082ce300dc (patch)
tree7854d3a4810d6640d4e124f4314c0bd7d7c0c288 /.gitattributes
parentaabf2166fbbcea1aa33287501815d18cafe5ad82 (diff)
parent32a5e01adf346ed317bfc6d5c7f7e994099f2448 (diff)
Merge remote-tracking branch 'origin/5.12.7' into 5.12
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions