Diana Huang 45baf013fe Merge branch 'master' into drupal-new

2013-05-02 17:04:39 -04:00

..

djangoapps

Merge branch 'master' into drupal-new

2013-05-02 17:04:39 -04:00

envs

Merge branch 'master' into drupal-new

2013-05-02 17:04:39 -04:00

lib

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

static

Merge branch 'master' into drupal-new

2013-05-02 17:04:39 -04:00

templates

Merge branch 'master' into drupal-new

2013-05-02 17:04:39 -04:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

CHANGELOG.md

…

one_time_startup.py

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

urls.py

Merge branch 'master' into drupal-new

2013-05-02 17:04:39 -04:00

wsgi.py

…

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00