Commits · master · Network / KIO GDrive

03 Jan, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 53b12b72
  Heiko Becker authored Jan 03, 2022
```
(cherry picked from commit 37dbaaf6)
```
  53b12b72
30 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c519c2c0

Script Kiddy authored Dec 30, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

c519c2c0

09 Dec, 2021 1 commit
- GIT_SILENT Update Appstream for new release · ca07b8f4
  Albert Astals Cid authored Dec 09, 2021
```
(cherry picked from commit c4a8f28e)
```
  ca07b8f4
27 Nov, 2021 1 commit
- Add GitLab CI · 3230ae8e
  Nicolas Fella authored Nov 27, 2021
  
  3230ae8e
24 Nov, 2021 1 commit
- Bump minimum cmake/qt versions · 69a062a4
  Elvis Angelaccio authored Nov 25, 2021
  
  69a062a4
08 Nov, 2021 1 commit
- GIT_SILENT Upgrade release service version to 22.03.70. · 4f227855
  Heiko Becker authored Nov 08, 2021
  
  4f227855
04 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 523f4104

Script Kiddy authored Nov 04, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

523f4104

01 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 104f0a10

Script Kiddy authored Nov 01, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

104f0a10

31 Oct, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 2c832e49
  Heiko Becker authored Oct 31, 2021
```
(cherry picked from commit fc8f8839)
```
  2c832e49
04 Oct, 2021 1 commit
- GIT_SILENT Update Appstream for new release · e9f65617
  Heiko Becker authored Oct 05, 2021
```
(cherry picked from commit d0aa82a0)
```
  e9f65617
19 Sep, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · faab51ee

Script Kiddy authored Sep 19, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

faab51ee

06 Sep, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7607e005

Script Kiddy authored Sep 06, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

7607e005

27 Aug, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 1d425bab
  Heiko Becker authored Aug 27, 2021
```
(cherry picked from commit 96b11868)
```
  1d425bab
22 Aug, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 578cd9a2

Script Kiddy authored Aug 22, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

578cd9a2

04 Aug, 2021 1 commit
- GIT_SILENT Update Appstream for new release · ae07881e
  Heiko Becker authored Aug 05, 2021
```
(cherry picked from commit 4b334739)
```
  ae07881e
27 Jul, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 20d635f2
  Script Kiddy authored Jul 27, 2021
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  20d635f2
- GIT_SILENT made messages (after extraction) · 688603ae
  Script Kiddy authored Jul 27, 2021
  
  688603ae
18 Jul, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7b06d00a

Script Kiddy authored Jul 18, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

7b06d00a

15 Jul, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b18ab23f

Script Kiddy authored Jul 15, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b18ab23f

10 Jul, 2021 1 commit
- GIT_SILENT Upgrade release service version to 21.11.70. · 44f483d5
  Albert Astals Cid authored Jul 10, 2021
  
  44f483d5
08 Jul, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6cb81907
  Script Kiddy authored Jul 08, 2021
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  6cb81907
- GIT_SILENT made messages (after extraction) · a64297b2
  Script Kiddy authored Jul 08, 2021
  
  a64297b2
05 Jul, 2021 1 commit
- GIT_SILENT Update Appstream for new release · fcdbed67
  Heiko Becker authored Jul 05, 2021
```
(cherry picked from commit bcf0cf19)
```
  fcdbed67
17 Jun, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9824d749

Script Kiddy authored Jun 17, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

9824d749

05 Jun, 2021 1 commit
- GIT_SILENT Update Appstream for new release · a7f26c5b
  Heiko Becker authored Jun 05, 2021
```
(cherry picked from commit 5b30577c)
```
  a7f26c5b
17 May, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 603e8cfb

Script Kiddy authored May 17, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

603e8cfb

07 May, 2021 1 commit
- GIT_SILENT Update Appstream for new release · b73b92b9
  Heiko Becker authored May 07, 2021
```
(cherry picked from commit 8157c2c8)
```
  b73b92b9
14 Apr, 2021 1 commit
- GIT_SILENT Update Appstream for new release · d6898be2
  Heiko Becker authored Apr 14, 2021
```
(cherry picked from commit 3f9bcab8)
```
  d6898be2
31 Mar, 2021 1 commit
- Fix tool tip for properties plugin "Copy URL" button · c1eda102
  Jonathan Marten authored Mar 31, 2021
```
I18N:
```
  c1eda102
27 Mar, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 1785cb8b

Script Kiddy authored Mar 27, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

1785cb8b

13 Mar, 2021 1 commit
- GIT_SILENT Upgrade release service version to 21.07.70. · a196369f
  Albert Astals Cid authored Mar 13, 2021
  
  a196369f
08 Mar, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b65a7118

Script Kiddy authored Mar 08, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

b65a7118

24 Feb, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 1dcb3707
  Heiko Becker authored Feb 25, 2021
```
(cherry picked from commit d3ba0bc9)
```
  1dcb3707
19 Feb, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d2d455bd

Script Kiddy authored Feb 19, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

d2d455bd

15 Feb, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4c863086

Script Kiddy authored Feb 15, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

4c863086

02 Feb, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 73e34c95

Script Kiddy authored Feb 02, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

73e34c95

01 Feb, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4f1ab18f

Script Kiddy authored Feb 01, 2021

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

4f1ab18f

29 Jan, 2021 1 commit
- GIT_SILENT Update Appstream for new release · f1e49ca5
  Heiko Becker authored Jan 29, 2021
```
(cherry picked from commit 1002121b)
```
  f1e49ca5
26 Jan, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ee267b09
  Script Kiddy authored Jan 26, 2021
```
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
```
  ee267b09
- GIT_SILENT made messages (after extraction) · af61facc
  Script Kiddy authored Jan 26, 2021
  
  af61facc