Skip to content
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.

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

Backport #1097, #1104, #1148 #1149

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

PR Type

What kind of change does this PR introduce?

  • Build or CI-related changes
  • Documentation content changes

Description


This is an automatic backport of pull request #1148 done by [Mergify](https://mergify.com). + manual backport of #1097 and #1104.

@mergify mergify bot added the conflicts label Jun 4, 2024
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of 9f811e5 has failed:

On branch mergify/bp/release/stable/6.0/pr-1148
Your branch is up to date with 'origin/release/stable/6.0'.

You are currently cherry-picking commit 9f811e5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   doc/controls/DrawerFlyoutPresenter.md
	modified:   doc/controls/ExtendedSplashScreen.md
	modified:   doc/controls/LoadingView.md
	modified:   doc/controls/NavigationBar.md
	modified:   doc/controls/ResponsiveView.md
	modified:   doc/controls/SafeArea.md
	modified:   doc/controls/ShadowContainer.md
	modified:   doc/getting-started.md
	modified:   doc/helpers/StatusBar-extensions.md
	modified:   doc/helpers/resource-extensions.md
	modified:   doc/lightweight-styling.md
	modified:   doc/toc.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   build/workflow/stage-determine-changes.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@agneszitte agneszitte force-pushed the mergify/bp/release/stable/6.0/pr-1148 branch from b49406c to 9b2cab4 Compare June 4, 2024 17:08
@agneszitte agneszitte changed the title docs: Documentation adjustments (backport #1148) docs: Documentation adjustments (backport #1097, #1104, #1148) Jun 4, 2024
@agneszitte agneszitte changed the title docs: Documentation adjustments (backport #1097, #1104, #1148) Backport #1097, #1104, #1148 Jun 4, 2024
@agneszitte agneszitte merged commit ec889c3 into release/stable/6.0 Jun 4, 2024
24 checks passed
@agneszitte agneszitte deleted the mergify/bp/release/stable/6.0/pr-1148 branch June 4, 2024 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants