Skip to content

Merging master into features/embeddedJson#27253

Merged
jcouv merged 468 commits intodotnet:masterfrom
CyrusNajmabadi:features/embeddedJson
May 30, 2018
Merged

Merging master into features/embeddedJson#27253
jcouv merged 468 commits intodotnet:masterfrom
CyrusNajmabadi:features/embeddedJson

Conversation

@CyrusNajmabadi
Copy link
Copy Markdown
Contributor

No description provided.

CyrusNajmabadi and others added 22 commits April 10, 2018 09:55
…ervices2

Extract out subsystem for allowing embedded languages to export language services.
…Regex

Merging latest changes into features/embeddedRegex
Allow an embedded language to participate in document highlighting.
…Json

Merging master into Features/embedded json
Merging master into features/embeddedJson
…Json

Merge master into features/embeddedJson
…Json

Merge master into features/embeddedJson
@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner May 30, 2018 10:32
@etbyrd etbyrd added the Community The pull request was submitted by a contributor who is not a Microsoft employee. label May 30, 2018
@CyrusNajmabadi
Copy link
Copy Markdown
Contributor Author

@jcouv or @jmarolf can you merge this in for me? Thanks!

@jcouv jcouv merged commit 4405dca into dotnet:master May 30, 2018
@jmarolf
Copy link
Copy Markdown
Contributor

jmarolf commented May 30, 2018

@jcouv @CyrusNajmabadi we shouldn't have merged this. this is merging into master.
image

@jcouv
Copy link
Copy Markdown
Member

jcouv commented May 30, 2018

My bad :-(
Thanks @jmarolf for catching this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Community The pull request was submitted by a contributor who is not a Microsoft employee.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants