search

Consensys / Tokens

Ethereum Token Contracts
MIT License
2.06k stars 1.2k forks source link

Move 1.0.0 from staging to master #105

Closed maurelian closed 6 years ago

maurelian commented 6 years ago

@skmgoldin and I discussed this on the 13th. His change LGTM. I reviewed the PR, and merged to staging. I think this staging branch is somewhat confusing, and should be removed.

But, for now I want to respect the existing governance processes.

skmgoldin commented 6 years ago

I'll double check this on Thursday. We are using our staging branch like a develop branch. It's just an extra layer of safety that helps us not merge broken code into master.

maurelian commented 6 years ago

Hope you don't mind, I merged your simple test suite update on top of this. I'm trying to get caugt up on github notifs. Since we're using rebase, it shouldn't mess with the commit history.

skmgoldin commented 6 years ago

Doesn't bother me at all.