VikParuchuri 01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes ...

Feature/vik/combined xmodule changes

2013-02-01 15:46:33 -08:00

..

djangoapps

Add in some removed imports (fix tests)

2013-01-31 17:11:44 -05:00

envs

pep8 cleanup

2013-02-01 13:13:16 -05:00

lib

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

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

static

Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes

2013-02-01 15:46:33 -08: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

…