Vik Paruchuri 01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

2013-01-31 16:50:10 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes

2013-01-31 16:50:10 -05:00

envs

Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"

2013-01-30 16:49:49 -05:00

lib

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

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

static

Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes

2013-01-31 16:50:10 -05:00

templates

Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes

2013-01-31 16:50:10 -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

Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes

2013-01-31 16:50:10 -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