Diana Huang f7424eb8d6 Merge branch 'master' into tests/diana/update-oe-unit-tests

2013-01-29 16:44:15 -05:00

..

djangoapps

Merge branch 'master' into tests/diana/update-oe-unit-tests

2013-01-29 16:44:15 -05:00

envs

Fix Pearson unit tests.

2013-01-28 12:56:26 -05:00

lib

Merge remote-tracking branch 'origin/master' into feature/kevin/groups

2013-01-23 16:26:06 -05:00

static

Merge branch 'master' into tests/diana/update-oe-unit-tests

2013-01-29 16:44:15 -05:00

templates

Merge branch 'master' into tests/diana/update-oe-unit-tests

2013-01-29 16:44:15 -05:00

__init__.py

…

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

urls.py

Add removing students from cohorts.

2013-01-24 15:14:33 -05:00

wsgi.py

Add a wsgi file for the lms that loads the modulestores immediately after the application starts

2012-08-28 12:01:05 -04:00