Skip to content

E
edx-platform
Commit 4c8a92e9 by Don Mitchell
Options

Merge branch 'dhm/timeconv/bug0' of github.com:edx/edx-platform into dhm/timeconv/bug0 

Conflicts:
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/timeinfo.py
parents cb40e9ff 48ee2757
Showing with 0 additions and 0 deletions
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