Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Merge 1.0.dev into Master #1296
Let's move our primary development onto the 1.0 branch by merging that into master.
I have pushed up a 0.16 branch which is the current state of master. Any future bugfixes that would make for a good candidate for a 0.16.x bugfix release can then be backported from master. That's easier to manage than forward-porting bugfixes from master to 1.0.dev. It also removes the need to then merge all that back to master later (I had to resolve a lot of conflicts to get this in shape, don't want to have to do that again).
Warning, I rebased 1.0.dev with master, so any existing 1.0.dev clones/forks won't merge with this directly. However, I did the work in a private branch and have not pushed the rebase publicly. Therefore, the 1.0.dev branch here on GitHub is left alone for reference purposes. It should simply be considered inactive.