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

Browse Source

Conflicts:
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/timeinfo.py

...

This commit is contained in:

Don Mitchell

2013-06-17 13:30:35 -04:00

parent cb40e9ff88 48ee275799

commit 4c8a92e968

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available