Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Merge from master #697

Merged
merged 3 commits into from
Dec 18, 2020
Merged

Merge from master #697

merged 3 commits into from
Dec 18, 2020

Conversation

superboyiii
Copy link
Member

No description provided.

superboyiii and others added 3 commits December 10, 2020 10:37
* Sync to neo-project/neo#2119

* Update nuget

Co-authored-by: Shargon <shargon@gmail.com>
* Update to Neo v3.0.0-CI01015

* Update neo-cli.csproj
* Fix Parse manifestFilePath

* merge master

* Update Name for NEP17

* fix format

* show error message

* fix

* fix
@superboyiii superboyiii merged commit 726a306 into Preview4 Dec 18, 2020
shargon added a commit that referenced this pull request Dec 18, 2020
* Final merge for Preview4 (#693)

* Sync to management SC (#689)

* Sync to neo-project/neo#2119

* Update nuget

Co-authored-by: Shargon <shargon@gmail.com>

* Update to Neo v3.0.0-CI01105 (#692)

* Update to Neo v3.0.0-CI01015

* Update neo-cli.csproj

Co-authored-by: Shargon <shargon@gmail.com>

* Merge from master (#697)

* Sync to management SC (#689)

* Sync to neo-project/neo#2119

* Update nuget

Co-authored-by: Shargon <shargon@gmail.com>

* Update to Neo v3.0.0-CI01105 (#692)

* Update to Neo v3.0.0-CI01015

* Update neo-cli.csproj

* Update name nep17 (#695)

* Fix Parse manifestFilePath

* merge master

* Update Name for NEP17

* fix format

* show error message

* fix

* fix

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: cloud8little <34291844+cloud8little@users.noreply.github.com>

* Preview4

* sync gui

* update changelog for preview 4 (#699)

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: cloud8little <34291844+cloud8little@users.noreply.github.com>
Co-authored-by: Qiao Jin <43407364+Qiao-Jin@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants