feat: adjust to master

Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>

.drone.star

@@ -2295,7 +2295,7 @@ def changelog():
                         "push",
                     ],
                     "message": "Automated changelog update [skip ci]",
-                    "branch": "stable-7.2",
+                    "branch": "master",
                     "author_email": "devops@owncloud.com",
                     "author_name": "ownClouders",
                     "netrc_machine": "github.com",
@@ -2408,7 +2408,7 @@ def docs():
                     },
                     "pages_directory": "docs/hugo/content/",
                     "copy_contents": "true",
-                    "target_branch": "docs-stable-7.2",
+                    "target_branch": "docs",
                     "delete": "true",
                 },
                 "when": {

CHANGELOG.md

@@ -234,23 +234,6 @@ The following sections list the changes for 7.2.0.
    https://github.com/owncloud/ocis/issues/11377
    https://github.com/owncloud/ocis/pull/11390
 
-<<<<<<< HEAD
-* Bugfix - Fix storage-users cli: [#11464](https://github.com/owncloud/ocis/pull/11464)
-
-   Fix storage-users uploads --resume command.
-
-   https://github.com/owncloud/ocis/issues/11290
-   https://github.com/owncloud/ocis/pull/11464
-
-* Bugfix - Clean up unified roles label: [#11464](https://github.com/owncloud/ocis/pull/11464)
-
-   Clean up the unified roles label
-
-   https://github.com/owncloud/ocis/issues/11470
-   https://github.com/owncloud/ocis/issues/11254
-   https://github.com/owncloud/ocis/issues/10082
-   https://github.com/owncloud/ocis/pull/11464
-
 * Bugfix - Return translated role definitions: [#11466](https://github.com/owncloud/ocis/pull/11466)
 
    Instead of always returning the role definitions in English, we now return the

changelog/7.2.0_2025-07-14/fix-roles-label.md

@@ -2,11 +2,7 @@ Bugfix: Clean up unified roles label
 
 Clean up the unified roles label
 
-<<<<<<< HEAD
 https://github.com/owncloud/ocis/pull/11464
-=======
-https://github.com/owncloud/ocis/pull/11494
->>>>>>> 20b5e24eed5 (chore: [OCISDEV-154] Clean up the unified roles label)
 https://github.com/owncloud/ocis/issues/11470
 https://github.com/owncloud/ocis/issues/11254
 https://github.com/owncloud/ocis/issues/10082

ocis-pkg/version/version.go

@@ -16,7 +16,7 @@ var (
 	// LatestTag is the latest released version plus the dev meta version.
 	// Will be overwritten by the release pipeline
 	// Needs a manual change for every tagged release
-	LatestTag = "7.2.0"
+	LatestTag = "7.2.0+dev"
 
 	// Date indicates the build date.
 	// This has been removed, it looks like you can only replace static strings with recent go versions

sonar-project.properties

@@ -2,7 +2,7 @@
 sonar.projectKey=owncloud_ocis
 sonar.organization=owncloud-1
 sonar.projectName=ocis
-sonar.projectVersion=7.2.0
+sonar.projectVersion=7.2.0+dev
 sonar.host.url=https://sonarcloud.io
 
 # =====================================================