There have been commits and releases happening in both master and staging without rebasing the commit histories of either. This branch merges master into a branch of staging to resolve conflicts and to get tests working. Once passing we will tag and release v1.3.1 and merge into staging, then we will merge staging into master.
There have been commits and releases happening in both
masterandstagingwithout rebasing the commit histories of either. This branch merges master into a branch of staging to resolve conflicts and to get tests working. Once passing we will tag and releasev1.3.1and merge into staging, then we will merge staging into master.