#22 #23
Merged
#22 #23
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
|
@thomasmodeneis - branch is not in sync with master, otherwise its good to merge, I trust the translations are in par with the English version. |
|
yes I'm trying to sync the branch and make this work. |
|
@thomasmodeneis any progress with this pull request ? |
…-getting-started-kit # By Mani Sarkar (146) and others # Via mani (8) and Ludovic HOCHET (1) * 'master' of https://github.com/AdoptOpenJDK/adoptopenjdk-getting-started-kit: (196 commits) synchronised the French version up to 2016-01-18 inclusive Update en/intermediate-steps/how_to_use_jtreg_-_java_regression_test_harness.md fr: ANSI to UTF-8 French Translation, updated whatsChanged.md synchronised the French version up to 2015-11-21 inclusive Amended two links in the README.md file Updated whats changed for all languages Added License and fixed the language prefix for two links Update en/README.md Update en/README.md Replaced all references to neomatrix369 to adoptopenjdk across all pages of all languages Update en/how-to-navigate/how_to_run_a_hackday,_how_to_prepare.md Update en/how-to-navigate/how_to_run_a_hackday,_how_to_prepare.md Update en/SUMMARY.md Create en/how-to-navigate/how_to_run_a_hackday,_how_to_prepare.md Update en/SUMMARY.md Updated new location for adopt-openjdk-kiss-vagrant after transfering to Adopt OpenJDK org on github Changes to the English and French What's changed pages. Update en/intermediate-steps/testing_java_early_project.md Update en/intermediate-steps/testing_java_early_project.md ... Conflicts: en/SUMMARY.md en/openjdk-projects/openjdk_projects.md en/whatsChanged.md
|
all ready for the merge, sorry for the delay. |
|
@thomasmodeneis any progress with this PR or should it be closed ? |
|
I left the merge to be completed by yourself sir, but I just did it. |
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.