Closed vlall closed 7 years ago
Using master as the base, I cherrypicked then resolved merge conflicts for specific commits from PR https://github.com/Dallinger/Griduniverse/pull/137/files for an immediate merge to master.
master
We need stories 263+266 for production and cannot wait on a merge between master<-->development required on both Griduniverse and Dallinger.
development
Description
Using master as the base, I cherrypicked then resolved merge conflicts for specific commits from PR https://github.com/Dallinger/Griduniverse/pull/137/files for an immediate merge to
master.Motivation and Context
We need stories 263+266 for production and cannot wait on a merge between
master<-->developmentrequired on both Griduniverse and Dallinger.