Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge VS Code 1.21 source code #1067

Merged
merged 28 commits into from
Apr 4, 2018
Merged

Merge VS Code 1.21 source code #1067

merged 28 commits into from
Apr 4, 2018

Conversation

kburtram
Copy link
Member

@kburtram kburtram commented Apr 4, 2018

This PR contains the VS Code 1.21 source code. We're trying to resolve a few more regressions from the merge prior to committing to master. Hopefully this will be ready to merge tonight.

@kburtram
Copy link
Member Author

kburtram commented Apr 4, 2018

I'm going to merge this and we'll can follow-up to fix remaining regressions.

@kburtram kburtram merged commit dafb780 into master Apr 4, 2018
@AbbiePetcht AbbiePetcht deleted the feature/merge121 branch May 14, 2018 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants