re-updates develop with merge conflicts resolved from master
#6492
+178
−471
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged `Release/9.11.1` into `master` to release v9.11.1
Merge `release/9.11.2` into `master` for release v9.11.2
Merged `Release/9.12.0` into `master` to release `v9.12.0`
Merged `release/9.13.0` into `master` to release `v9.13.0`
Ensures the yarn cache folder exists before doing yarn caching
Fixed a CI issue that prevented yarn package caching
Merged `release/9.13.1` into `master` to release `v9.13.1`
This should fix the build issue.
Re-applies #5924 onto the release branch
Merged `release/9.13.2` into `master` to release `v1.13.2`
Merges `release/9.13.3` into `master` to release `v9.13.3`
Merged `release/9.13.4` into `master` to release `v9.13.4`
It's build directly via the PackageMicrosoftGlobbing task
Update DotNetNuke.Newtonsoft.Json.dnn to reference version 13.0.3
Fix nuspec dependencies
Merged `release/9.13.5` into `mater` to release `v9.13.5`
Merged `release/9.13.6` into `main` to release `v9.13.6`
Released v9.13.7
Released v9.13.8
Updates `mater` with latest fixes from `develop`
Merged `release/10.0.0` into `master` to release v10
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
re-updates
developwith merge conflicts resolved frommaster