Commit bae888ff by Pavel Yushchenko

Merge branch 'select' of github.com:Man2Life/edx-platform into select

Conflicts:
	cms/djangoapps/contentstore/views/tabs.py
parents 049fe8b8 bd7b2faa
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment