Rocky Duan a8e23dcc53 Merge branch 'master' into discussion2 ...

Conflicts:
	lms/templates/discussion/_forum.html
	lms/templates/discussion/_inline.html

2012-08-01 19:46:52 -04:00

..

askbot/skins

Sorta fix askbot

2012-07-31 16:29:01 -04:00

djangoapps

basic sorting

2012-08-01 19:44:07 -04:00

envs

Merge branch 'master' of github.com:MITx/mitx

2012-08-01 16:45:21 -04:00

lib

basic sorting

2012-08-01 19:44:07 -04:00

static

padding and margins of discussion containers

2012-08-01 18:14:59 -04:00

templates

Merge branch 'master' into discussion2

2012-08-01 19:46:52 -04:00

__init__.py

Moving LMS code into subdirectory

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

urls.py

Merge branch 'master' of github.com:MITx/mitx

2012-07-30 17:41:19 -04:00