pinknetworkx / atomicassets-contract

Smart Contract of the AtomicAssets standard.
MIT License
149 stars 88 forks source link

Catching up commits from other repo #2

Closed jona-wilmsmann closed 4 years ago

jona-wilmsmann commented 4 years ago

I made some commits in a private repo that wasn't properly forked from the master branch and could therefore not properly be pulled/ merged.