Bridger Maxwell 14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki ...

Conflicts:
	lms/templates/wiki/settings.html

2012-08-22 13:09:42 -04:00

..

askbot/skins

Added styles for single question and profile view

2012-08-15 13:51:10 -04:00

djangoapps

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-22 13:09:42 -04:00

envs

Changed wiki setting so article owners can't change permissions.

2012-08-21 23:06:45 -04:00

lib

added shared key authentication

2012-08-21 15:45:41 -07:00

static

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-22 13:09:42 -04:00

templates

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-22 13:09:42 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

urls.py

Merge pull request #479 from MITx/feature/arjun/syllabus

2012-08-21 14:33:07 -07:00