diff options
author | Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> | 2021-08-09 12:34:48 +0000 |
---|---|---|
committer | Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> | 2021-08-09 12:34:48 +0000 |
commit | 607edbcd8689ea71ec57340204ed3d908a7cadbb (patch) | |
tree | 91961406adb5143e0c5072094d2d1a4846e6b6b0 /qtquickcontrols2.conf | |
parent | 34abe223f7648929f0c6b9132fbdc83e0353b51a (diff) | |
parent | fd5e881fdee35d21fd3e0728e5b927d04e64f459 (diff) | |
download | RWA.Support.DesktopApp-607edbcd8689ea71ec57340204ed3d908a7cadbb.tar.gz RWA.Support.DesktopApp-607edbcd8689ea71ec57340204ed3d908a7cadbb.tar.bz2 RWA.Support.DesktopApp-607edbcd8689ea71ec57340204ed3d908a7cadbb.zip |
Merge branch 'mr/feature/gitlab-ci' into 'master'
Add .gitlab-ci.yml
See merge request remotewebapp/rwa.support.desktopapp!2
Diffstat (limited to 'qtquickcontrols2.conf')
-rw-r--r-- | qtquickcontrols2.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf index e646650..8bcc85b 100644 --- a/qtquickcontrols2.conf +++ b/qtquickcontrols2.conf @@ -1,7 +1,7 @@ # This file is part of Remote Support Desktop # https://gitlab.das-netzwerkteam.de/RemoteWebApp/rwa.support.desktopapp -# Copyright 2020-2021 Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> -# Copyright 2020-2021 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright 2020, 2021 Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> +# Copyright 2020, 2021 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # SPDX-License-Identifier: GPL-2.0-or-later # # This program is free software; you can redistribute it and/or modify |