Adam/merge conflicts - #856
Merged
Merged
Conversation
Comments (and processing instructions!) are handled oddly in lxml. This change will keep them from causing failures. They will be omitted from the HTML generated, which is fine, since they aren't needed there.
Check extension rather than mimetype
Hotfix/xml parsing
Hotfix/release multiple video bug
jenkins-ks
pushed a commit
to nttks/edx-platform
that referenced
this pull request
Aug 9, 2016
jenkins-ks
pushed a commit
to nttks/edx-platform
that referenced
this pull request
Aug 9, 2016
…dd-app-label Add app_label openedx#856
cgopalan
referenced
this pull request
in open-craft/openedx-platform
Aug 31, 2017
[MCKIN-5641] OAuth2 API to call XBlock handlers
andrey-canon
pushed a commit
to eduNEXT/edx-platform
that referenced
this pull request
Aug 16, 2018
…report Creating a custom certificates report
caesar2164
added a commit
to caesar2164/edx-platform
that referenced
this pull request
Dec 18, 2018
Update Platform Tour xBlock to v1.0.1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
because there were merge conflicts between release and master, in order to add the hotfix's commits to master, I did the following: