Brian Talbot 8ec4c09615 local merge conflict resolution

2013-02-13 13:41:35 -05:00

..

djangoapps

html changed; so, removed mostly meaningless comparison and fixed one.

2013-02-13 11:53:26 -05:00

envs

Make it so that cms doesn't try to run collectstatic on course content

2013-02-08 10:49:43 -05:00

static

local merge conflict resolution

2013-02-13 13:41:35 -05:00

templates

resolving merge from feature/btalbot/studio-softlanding

2013-02-13 12:42:15 -05:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Make lms and cms coverage reports cover common/djangoapps

2013-02-05 11:06:46 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

urls.py

howitworks is default home page if not logged in. Otherwise course

2013-02-13 09:30:54 -05:00