aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/gitlab
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2024-06-21 13:54:42 +0200
committerEike Ziller <eike.ziller@qt.io>2024-06-21 13:54:42 +0200
commit12c1731489108e269e3e73eab82338da463aa0a0 (patch)
treec7ddb1fb88cdb9bd2ec25e1a134a39361a8b5169 /src/plugins/gitlab
parente30dd3c5ee18462b9b6ec5632efa0b5528f4971f (diff)
parent65f766572289a7de60cc81de52857663e7467ef4 (diff)
Merge remote-tracking branch 'origin/14.0'HEADmaster
Conflicts: src/plugins/qmljseditor/qmljseditingsettingspage.cpp src/plugins/qmljseditor/qmllssettings.h Change-Id: I49b97101467a6e80653c0f5f3e3fe5801dca5274
Diffstat (limited to 'src/plugins/gitlab')
0 files changed, 0 insertions, 0 deletions