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

..

djangoapps

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

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

lib

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

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

static

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

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

templates

Update jquery ui. Overrode draggable w/ an in place fix for scroll

2013-01-25 12:44:58 -05:00

test

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

2013-01-17 09:15:37 -05:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00