Skip to content

Commit 4750f06

Browse files
authored
Merge pull request #2116 from nextcloud/update-master-version
feat(deps): Add Nextcloud 33 support on master
2 parents 8e60fbb + 18badad commit 4750f06

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/npm-audit-fix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
branches: ['main', 'master', 'stable31', 'stable30']
27+
branches: ['main', 'master', 'stable32', 'stable31', 'stable30']
2828

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

.github/workflows/update-nextcloud-ocp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
branches: ['main', 'master', 'stable31', 'stable30']
27+
branches: ['main', 'master', 'stable32', 'stable31', 'stable30']
2828

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

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
More information is available in the Activity documentation.
1616
</description>
1717

18-
<version>5.0.0-dev.0</version>
18+
<version>6.0.0-dev.0</version>
1919
<licence>agpl</licence>
2020
<author>Frank Karlitschek</author>
2121
<author>Joas Schilling</author>
@@ -37,7 +37,7 @@
3737
<repository>https://github.com/nextcloud/activity.git</repository>
3838

3939
<dependencies>
40-
<nextcloud min-version="32" max-version="32" />
40+
<nextcloud min-version="33" max-version="33" />
4141
</dependencies>
4242

4343
<background-jobs>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "activity",
3-
"version": "5.0.0-dev.0",
3+
"version": "6.0.0-dev.0",
44
"private": true,
55
"description": "This application enables people to view a log of activities about them or about files.",
66
"homepage": "https://github.com/nextcloud/activity",

0 commit comments

Comments
 (0)