Skip to content

Commit

Permalink
Merge pull request #620 from nextcloud/update-master-version
Browse files Browse the repository at this point in the history
feat(deps): Add Nextcloud 30 support on master
  • Loading branch information
artonge authored Mar 28, 2024
2 parents 6523490 + 2403673 commit 471b4ac
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-audit-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable28', 'stable27', 'stable26']
branches: ['main', 'master', 'stable29', 'stable28', 'stable27']

name: npm-audit-fix-${{ matrix.branches }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ['main', 'master', 'stable28', 'stable27', 'stable26']
branches: ['main', 'master', 'stable29', 'stable28', 'stable27']

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Provides the necessary endpoint to enable end-to-end encryption.
**Notice:** E2EE is currently not compatible to be used together with server-side encryption
]]></description>
<version>1.15.2</version>
<version>1.16.0</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>EndToEndEncryption</namespace>
Expand All @@ -23,7 +23,7 @@ Provides the necessary endpoint to enable end-to-end encryption.
<repository type="git">https://github.com/nextcloud/end_to_end_encryption.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/end_to_end_encryption/master/screenshots/e2ee-filelisting.png</screenshot>
<dependencies>
<nextcloud min-version="29" max-version="29" />
<nextcloud min-version="30" max-version="30" />
</dependencies>
<background-jobs>
<job>OCA\EndToEndEncryption\BackgroundJob\RollbackBackgroundJob</job>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "end_to_end_encryption",
"version": "1.15.0",
"version": "1.16.0",
"description": "Provides the necessary endpoint to enable End-to-End encryption.",
"private": true,
"scripts": {
Expand Down

0 comments on commit 471b4ac

Please sign in to comment.