Skip to content

[7.17] Adds multifactor term to glossary (backport #2797) #2817

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024

Adds multifactor term to the glossary


This is an automatic backport of pull request #2797 done by Mergify.

(cherry picked from commit b6cb7ca)

# Conflicts:
#	docs/en/glossary/glossary.asciidoc
Copy link
Contributor Author

mergify bot commented Sep 19, 2024

Cherry-pick of b6cb7ca has failed:

On branch mergify/bp/7.17/pr-2797
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit b6cb7ca0.
  (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:
	new file:   docs/en/glossary/terms/multifactor.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/glossary/glossary.asciidoc

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

@KOTungseth KOTungseth closed this Sep 19, 2024
@KOTungseth KOTungseth deleted the mergify/bp/7.17/pr-2797 branch September 19, 2024 15:07
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.

1 participant