Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release back to master. #11824

Merged
merged 9 commits into from
Mar 17, 2016
Merged

Merge release back to master. #11824

merged 9 commits into from
Mar 17, 2016

Conversation

tobz
Copy link
Contributor

@tobz tobz commented Mar 16, 2016

Part of the 2016-03-16 release.

muzaffaryousaf and others added 9 commits March 14, 2016 19:52
Properly escape mixed content. text + html.
…t-shown

render progress status while problem content rendering
The fork actually does include a commit that is not in the PyPI version.

ECOM-3833
Release Candidate rc/2016-03-16
tobz added a commit that referenced this pull request Mar 17, 2016
Merge release back to master.
@tobz tobz merged commit 9b8ff77 into master Mar 17, 2016
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.

None yet

2 participants