Skip to content
Snippets Groups Projects
Commit 6dcd7cdd authored by Chris Dodge's avatar Chris Dodge
Browse files

Merge branch 'release' 

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
parents c1d63919 c7546271
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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