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.

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

Jump to bottom

PD-1541 / 3.0 / Pd 1541 update product version switcher for apps backports (by DjP-iX) #3242

Merged
merged 5 commits into from
Nov 15, 2024
Merged

PD-1541 / 3.0 / Pd 1541 update product version switcher for apps backports (by DjP-iX) #3242

merged 5 commits into from
Nov 15, 2024

Conversation

bugclerk
Copy link
Contributor

Automatic cherry-pick failed. Please resolve conflicts by running:

git cherry-pick -x c580823295e8058b08dd2a4d90ae4821c538bf48

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~3
git cherry-pick -x 32f33cbc0a93597d3b7bd51cb1fc772f1d58e1df

Thanks for contributing to TrueNAS documentation! By opening a Pull Request, you're acknowledging that your changes will be distributed under the Creative Commons 4.0 license.

Original PR: #3235
Jira URL: https://ixsystems.atlassian.net/browse/PD-1541

@DjP-iX @bugclerk
Update docs-nav.html
533fc6f 
(cherry picked from commit cc7fe89)
@DjP-iX @bugclerk
Revert "Update docs-nav.html"
8d23898 
This reverts commit cc7fe89.

(cherry picked from commit 0b62440)
@DjP-iX @bugclerk
Update docs-nav.html
4a9b256 
(cherry picked from commit 0019e29)
@DjP-iX
PD-1541 / 24.10 / Pd 1541 update product version switcher for apps ba…
3ed6788 
…ckports (#3235)

* Update docs-nav.html

* Revert "Update docs-nav.html"

This reverts commit cc7fe89.

* Update docs-nav.html

* Update words-to-ignore.txt

(cherry picked from commit 32f33cb)
@DjP-iX
Merge branch 'PD-1541-3.0' of https://github.com/truenas/documentation …
f19cf55 
…into PD-1541-3.0
@DjP-iX DjP-iX marked this pull request as ready for review November 15, 2024 17:26
@DjP-iX DjP-iX requested a review from a team as a code owner November 15, 2024 17:26
@micjohnson777 micjohnson777 merged commit aaef296 into 3.0 Nov 15, 2024
3 checks passed
@micjohnson777 micjohnson777 deleted the PD-1541-3.0 branch November 15, 2024 17:38
@micjohnson777 micjohnson777 added the Technical Writer Review (MJ) A technical writer is reviewing the PR. label Nov 15, 2024
@bugclerk
Copy link
Contributor Author

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Nov 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@micjohnson777 micjohnson777 micjohnson777 approved these changes

Assignees

@DjP-iX DjP-iX

Labels
Technical Writer Review (MJ) A technical writer is reviewing the PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bugclerk @micjohnson777 @DjP-iX