Skip to content

Commit

Permalink
Merge pull request #5314 from nextcloud/update-main-version
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Nov 23, 2023
2 parents 1a4f96e + 04c8d93 commit 1e27ffa
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ updates:
- juliushaertl

- package-ecosystem: npm
target-branch: stable27
target-branch: stable28
versioning-strategy: lockfile-only
directory: "/"
schedule:
Expand All @@ -30,7 +30,7 @@ updates:
- dependencies

- package-ecosystem: npm
target-branch: stable26
target-branch: stable27
versioning-strategy: lockfile-only
directory: "/"
schedule:
Expand Down
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", "stable27", "stable26", "stable25", "stable24"]
branches: ["main", "master", "stable28", "stable27", "stable26", "stable25", "stable24"]

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", "stable27", "stable26", "stable25"]
branches: ["main", "master", "stable28", "stable27", "stable26"]

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 @@ -16,7 +16,7 @@
- 🚀 Get your project organized

</description>
<version>1.12.0-beta.3</version>
<version>1.13.0-dev</version>
<licence>agpl</licence>
<author>Julius Härtl</author>
<documentation>
Expand All @@ -38,7 +38,7 @@
<database min-version="9.4">pgsql</database>
<database>sqlite</database>
<database min-version="8.0">mysql</database>
<nextcloud min-version="28" max-version="28"/>
<nextcloud min-version="29" max-version="29"/>
</dependencies>
<background-jobs>
<job>OCA\Deck\Cron\DeleteCron</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.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "deck",
"description": "",
"version": "1.12.0-beta.3",
"version": "1.13.0-dev",
"authors": [
{
"name": "Julius Härtl",
Expand Down Expand Up @@ -106,4 +106,4 @@
"<rootDir>/node_modules/jest-serializer-vue"
]
}
}
}

0 comments on commit 1e27ffa

Please sign in to comment.