Skip to content

Conversation

@itsjeyd
Copy link
Member

@itsjeyd itsjeyd commented Sep 28, 2016

cf. OC-1875

To prepare for merging master to edx-release (#119), this PR merges changes from edx-release back into master.

After resolving conflicts, no changes from edx-release remained: Most of the commits are version bumps that we don't need on master (since it's already at a higher version than edx-release). The other commits introduce changes that turned out to be present on master already. We also don't want to pull in changes to .travis.yml since that file doesn't exist on master (we now use CircleCI to run tests).

List of commits on edx-release that were not in master, by PR:

PR #117 (7467e27):

PR #106 (fe0e825):

PR #97 (a4e1e42):

  • 8f98767: Version bump, not included

Test instructions

No changes, so no need for manual testing :)

Reviewers

@smarnach
Copy link
Contributor

👍

  • I didn't test this. There are no changes
  • I didn't read through the code. There is no code.
  • Neither did I check for accessibility issues.
  • Nor is there anything to document.

@itsjeyd
Copy link
Member Author

itsjeyd commented Sep 28, 2016

@smarnach This is the smallest PR ever! :D Thanks for the review. Merging now.

@itsjeyd itsjeyd merged commit d6ffe52 into master Sep 28, 2016
@bradenmacdonald bradenmacdonald deleted the merge-edx-release branch October 26, 2016 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants