Skip to content

Commit

Permalink
Merge pull request #1054 from nextcloud/update-master-version
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Mar 28, 2024
2 parents 1adbc14 + 8ee0ad9 commit cd1374e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable28
target-branch: stable29
labels:
- "3. to review"
- "dependencies"
Expand All @@ -46,7 +46,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable27
target-branch: stable28
labels:
- "3. to review"
- "dependencies"
Expand All @@ -62,7 +62,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable26
target-branch: stable27
labels:
- "3. to review"
- "dependencies"
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', 'stable28', 'stable27', 'stable26']
branches: ['main', 'master', 'stable29', 'stable28', 'stable27']

name: npm-audit-fix-${{ 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 @@ -5,14 +5,14 @@
<name>Privacy</name>
<summary>-</summary>
<description><![CDATA[The privacy center shows you where your data is stored and who can access it, either because you shared with them or because they are administrators.]]></description>
<version>1.13.0</version>
<version>2.0.0</version>
<licence>agpl</licence>
<author mail="georg.ehrke@nextcloud.com">Georg Ehrke</author>
<namespace>Privacy</namespace>
<category>tools</category>
<bugs>https://github.com/nextcloud/privacy/issues/</bugs>
<dependencies>
<nextcloud min-version="29" max-version="29" />
<nextcloud min-version="30" max-version="30" />
</dependencies>
<default_enable />
<settings>
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": "privacy",
"version": "1.13.0",
"version": "2.0.0",
"description": "Place this app in **nextcloud/apps/**",
"private": true,
"scripts": {
Expand Down

0 comments on commit cd1374e

Please sign in to comment.