John Jarvis 7023eb4c19 resolving merge conflicts

2014-07-21 13:42:06 -04:00

..

djangoapps

resolving merge conflicts

2014-07-21 13:42:06 -04:00

envs

ignore MAC meta files on import and also remove any such files from the course

2014-07-21 13:16:00 +05:00

lib

ispublic is in active use by Stanford.

2014-07-18 20:28:06 -04:00

static

Merge pull request #4172 from edx/cdodge/ecommerce-improvements

2014-07-10 15:23:58 -04:00

templates

resolving merge conflicts

2014-07-21 13:42:06 -04:00

__init__.py

…

.coveragerc

…

startup.py

Add mimetype additions in studio startup

2014-05-29 11:44:14 -04:00

tests.py

Add missing mimetypes for xblock resources

2014-05-29 11:14:00 -04:00

urls.py

asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS

2014-07-10 09:35:32 -04:00

wsgi_apache_lms.py

…

wsgi.py

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00