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.

Sign up for GitHub

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

Jump to bottom

Sync with 2239 and 2235 #430

Merged
merged 6 commits into from
Jan 15, 2021
Merged

Sync with 2239 and 2235 #430

merged 6 commits into from
Jan 15, 2021

Conversation

shargon
Copy link
Member

@shargon shargon commented Jan 15, 2021 •
edited
Loading

@erikzhang
Copy link
Member

And the templates.

@shargon shargon marked this pull request as ready for review January 15, 2021 08:48
@shargon shargon changed the title Sync with 2239 Sync with 2239 and 2235 Jan 15, 2021
@shargon
Copy link
Member Author

shargon commented Jan 15, 2021

Wait for the last nuget with the nef changes

@shargon @erikzhang
Update templates/Template.CSharp/Contract1.cs
d4b9db8 
Co-authored-by: Erik Zhang <erik@neo.org>
@Tommo-L
Copy link
Contributor

Tommo-L commented Jan 15, 2021

UT failed

@shargon
Copy link
Member Author

shargon commented Jan 15, 2021

Ready

@shargon shargon merged commit 1f1b28d into neo-project:master Jan 15, 2021
@shargon shargon deleted the sync-deploy branch January 15, 2021 10:33
@shargon shargon mentioned this pull request Jan 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erikzhang erikzhang erikzhang approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shargon @erikzhang @Tommo-L