Rocky Duan fddee7defa Merge branch 'brittany' of github.com:dementrock/mitx ...

Conflicts:
	lms/templates/discussion/_recent_active_posts.html

2012-08-07 16:19:10 -04:00

..

askbot/skins

Sorta fix askbot

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

djangoapps

show recently active posts user's following

2012-08-07 16:16:23 -04:00

envs

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

2012-08-06 22:38:31 -04:00

lib

show recently active posts user's following

2012-08-07 16:16:23 -04:00

static

recent activity

2012-08-07 16:11:24 -04:00

templates

Merge branch 'brittany' of github.com:dementrock/mitx

2012-08-07 16:19:10 -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 into merge

2012-08-06 22:38:31 -04:00