Don Mitchell b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce ...

Feature/christina/tiny mce

2013-01-23 09:14:42 -08:00

..

djangoapps

Merge pull request #1295 from MITx/feature/jarv/certificate-force-update

2013-01-23 06:32:41 -08:00

envs

Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post

2013-01-22 23:50:38 -05:00

lib

Commented on high level functions

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

static

studio - resolved base variable missing issue on lms side

2013-01-22 16:31:42 -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

…