Dennis Jen d2660e530f Merge branch 'release' ...

Conflicts:
	lms/templates/verify_student/make_payment_step.underscore

2015-01-08 15:02:26 -05:00

..

djangoapps

Initial framework for the Course About API.

2015-01-07 20:03:54 +05:00

lib

Merge branch 'release'

2015-01-08 15:02:26 -05:00

static

Merge pull request #6252 from edx/studio-move-branded

2015-01-08 12:42:40 -05:00

templates

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

test

Test pagination reposition test is failing

2015-01-07 11:23:59 -05:00

.gitignore

…