Skip to content

Release: merge development into beta #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubenvdlinde merged 9 commits into from
Aug 31, 2026
Merged

Release: merge development into beta #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9152691
chore(release): sync beta back into development
github-actions[bot] Aug 30, 2026
ebe0ae9
chore(release): sync beta back into development
github-actions[bot] Aug 31, 2026
efbe7bd
chore(sync): carry beta back into development
github-actions[bot] Aug 31, 2026
e3d4e96
Merge pull request #521 from ConductionNL/sync/beta-to-development-20…
rubenvdlinde Aug 31, 2026
e8adede
chore(deps): @conduction/nextcloud-vue 2.24.3 -> 2.25.1 (#524)
rubenvdlinde Aug 31, 2026
ecf7fc3
Merge pull request #520 from ConductionNL/sync/beta-to-development-1.…
rubenvdlinde Aug 31, 2026
eb0ff05
Merge pull request #506 from ConductionNL/sync/beta-to-development-1.…
rubenvdlinde Aug 31, 2026
0f1bbd0
chore(release): 1.1.10-unstable.20260831053139 (#528)
github-actions[bot] Aug 31, 2026
4bc8417
chore(deps): refresh the shared Conduction locks (#527)
rubenvdlinde Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Gratis en open source onder de EUPL-1.2 licentie.
which quoted the grep command in order to WARN about the problem —
made it read ")[^". The warning reproduced the bug it described.
-->
<version>1.1.7-unstable.20260830174749</version>
<version>1.1.10-unstable.20260831053139</version>
<licence>EUPL-1.2</licence>
<author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
<namespace>Thematiq</namespace>
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@gouvfr/dsfr": "^1.15.1"
},
"devDependencies": {
"@conduction/nextcloud-vue": "^2.22.1",
"@conduction/nextcloud-vue": "^2.25.1",
"@cyclonedx/cyclonedx-npm": "^6.0.1",
"@nextcloud/prettier-config": "^1.2.0",
"@openfun/cunningham-tokens": "^3.0.0",
Expand Down
Loading