Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

coffee

…

css/vendor

…

images

Delete unused icon, reorder dropdown.

2013-01-23 11:02:16 -05:00

js

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts

2013-01-26 12:37:26 -05:00

sass

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

scripts

…