Skip to content

Commit

Permalink
Merge branch 'release/1.2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
infeo committed Oct 19, 2023
2 parents 18d22df + 610ec7d commit ea24cea
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ defaults:
jobs:
analyse:
name: Analyse
runs-on: windows-2019
runs-on: windows-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>integrations-win</artifactId>
<version>1.2.3</version>
<version>1.2.4</version>

<name>Cryptomator Integrations for Windows</name>
<description>Provides optional Windows services used by Cryptomator</description>
Expand Down Expand Up @@ -39,11 +39,11 @@
<!-- runtime dependencies -->
<api.version>1.3.0</api.version>
<slf4j.version>2.0.9</slf4j.version>
<jackson.version>2.15.2</jackson.version>
<jackson.version>2.15.3</jackson.version>

<!-- test dependencies -->
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<mockito.version>5.5.0</mockito.version>
<mockito.version>5.6.0</mockito.version>

<!-- build plugin dependencies -->
<dependency-check.version>8.4.0</dependency-check.version>
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/WinIntegrationsBundle_be.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.cryptomator.windows.keychain.displayName=Ахова даных на Windows
1 change: 1 addition & 0 deletions src/main/resources/WinIntegrationsBundle_bg.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.cryptomator.windows.keychain.displayName=Windows Data Protection
Empty file.
1 change: 1 addition & 0 deletions src/main/resources/WinIntegrationsBundle_fil.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.cryptomator.windows.keychain.displayName=Windows Data Protection

0 comments on commit ea24cea

Please sign in to comment.