Merge branch 'release'

Browse Source

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py

...

This commit is contained in:

Chris Dodge

2013-09-23 14:16:20 -04:00

parent c1d63919d8 c754627187

commit 6dcd7cdd65

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