Update master with changes from edx-release #123
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cf. OC-1875
To prepare for merging
mastertoedx-release(#119), this PR merges changes fromedx-releaseback intomaster.After resolving conflicts, no changes from
edx-releaseremained: Most of the commits are version bumps that we don't need onmaster(since it's already at a higher version thanedx-release). The other commits introduce changes that turned out to be present onmasteralready. We also don't want to pull in changes to.travis.ymlsince that file doesn't exist onmaster(we now use CircleCI to run tests).List of commits on
edx-releasethat were not inmaster, by PR:PR #117 (7467e27):
PR #106 (fe0e825):
PR #97 (a4e1e42):
Test instructions
No changes, so no need for manual testing :)
Reviewers