Updating French for 3.0.18#2664
Merged
jasonvarga merged 27 commits intostatamic:masterfrom Oct 15, 2020
ebeauchamps:french-fix
Merged
Updating French for 3.0.18#2664jasonvarga merged 27 commits intostatamic:masterfrom ebeauchamps:french-fix
jasonvarga merged 27 commits intostatamic:masterfrom
ebeauchamps:french-fix
Conversation
Merging from upstream
Merging from Upstream
Merging from upstream
Merging from upstream
Member
|
Thanks! Please sort out your fork so you don't keep PR'ing a million commits. 🙏 |
Contributor
Author
|
Sorry Jason, I just DON'T know how to do that correctly. I tried to merge from upstream, I tried to compare branch and merge statamic/cms into ebeauchamps/cms, to no avail. |
Contributor
Author
|
hey @jasonvarga |
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
2 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.
No description provided.