Merge master to iris - Githubissues

aeternity / protocol

Specification of the æternity blockchain protocol

https://docs.aeternity.com/protocol

208 stars 76 forks source link

Closed cytadela8 closed 3 years ago

gorbak25 commented 3 years ago

@velzevur @uwiger Is it time for the backmerge?

cytadela8 commented 3 years ago

Personally I'm more in favour of rebase. iris branch contains nearly nothing

cytadela8 commented 3 years ago

I'm also investigating if something needs to be moved to aesophia as two of the changes files where moved there.

cytadela8 commented 3 years ago

Nothing needs to be moved to aesophia. I think we should rebase the changes and consider merging to master.

hanssv commented 3 years ago

Some redundant things on iris branch - #485 will be cleaner I think?!

cytadela8 commented 3 years ago

Replaced with #485