Bring approved fixes from hotfix to integration #2175
Merged
Conversation
This file contains 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
hotfix 3.1.1: Fix PT translation
Also corrected one PT error in crops (Marang/...-> Moringa) (cherry picked from commit 19b28bd)
(cherry picked from commit 87c0ffd)
(cherry picked from commit 3b81b3d)
(cherry picked from commit 7c4f678)
(cherry picked from commit 261cc3a)
(cherry picked from commit 346e94b)
(cherry picked from commit 62e2927)
(cherry picked from commit ee9dc2e)
(cherry picked from commit 1dd37a1)
(cherry picked from commit b3540f1)
(cherry picked from commit d65f65e)
Made cherry pick
Made cherry pick
…fw-without-an-account-causes-issues Fixed update user
…olean-column-to-user-table Added sandbox_user column to users table
|
@Cali0707 Could you take a look at the merge conflicts, please? Go ahead an resolve any that are clear to you, and let me know if others are not. Thanks. |
…tion Fixes jul 2022 merge resolution
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.
No description provided.