Port release-2.1 fixes to release-2.2#14809
Merged
Merged
Conversation
(cherry picked from commit cc8ce59)
# Conflicts: # src/server/editorServices.ts # src/server/project.ts (cherry picked from commit 456614f)
…with only .js files (cherry picked from commit 98516e7)
(cherry picked from commit 16c7bcf)
(cherry picked from commit ff09479)
(cherry picked from commit 2721a8c)
(cherry picked from commit e9e7271)
Member
Author
|
I'll port to 'master' the same changes if/when happy with these. |
RyanCavanaugh
approved these changes
Mar 23, 2017
mhegazy
approved these changes
Mar 24, 2017
Merged
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
CC @mhegazy and @RyanCavanaugh
Ryan, your changes in release-2.1 gave errors in this branch due to Map changes, so the last commit switches to the new API. Please double check. Thanks.