Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
87ff18dc564e5331eebf96a7ba40aeed7319a7f0
edx-platform/common/lib/xmodule/setup.py
Chris Dodge 55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00

2.0 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink