Merge master into develop to bring some direct-to-master changes. - #554
Merged
Conversation
Merge appsembler/tahoe/develop into appsembler/tahoe/master
Merge set of approved PRs from appsembler/tahoe/develop into appsembler/tahoe/master
Merge develop into master
Periodic Tahoe Master <- Develop merge
develop -> master
…tio-studio fix uploaded image aspect ratio in tinymce
Merge develop into master
Merge appsembler/tahoe/develop into appsembler/tahoe/master
Appsembler/tahoe/develop
The usual develop into master merge.
The usual develop -> master
melvinsoft
approved these changes
Mar 27, 2020
thraxil
approved these changes
Mar 27, 2020
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Sometimes like we merge directly to
masterinstead ofdeveloplike we did in #498. This PR brings those changes into develop so it's in sync with production.