Calen Pennington 75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

envs

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

lib

Commented on high level functions

2013-01-22 01:40:13 -07:00

static

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -05:00

templates

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2013-01-22 14:47:52 -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/cale/cms-master

2013-01-22 14:47:52 -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