Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

64b1f2b7

Commit 64b1f2b7 authored 11 years ago by jkarni

Downloads
- Plain Diff

Merge pull request #904 from edx/jkarni/fix/textbook-upload

Fix element name conflict

parents 54343881 0acaaa88

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/features/upload.py 2 additions, 2 deletions

cms/djangoapps/contentstore/features/upload.py
cms/djangoapps/contentstore/views/assets.py 2 additions, 2 deletions

cms/djangoapps/contentstore/views/assets.py
cms/templates/asset_index.html 1 addition, 1 deletion

cms/templates/asset_index.html

with 5 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment