Adam Palay 7e45858276 resolve merge conflicts between release and master

2015-01-12 13:47:30 -05:00

..

djangoapps

Merge pull request #6447 from edx/markhoeber-doc1437

2015-01-12 12:11:32 -05:00

lib

resolve merge conflicts between release and master

2015-01-12 13:47:30 -05:00

static

fixing styling and class syntax (to new FA-based classes) for missing UI elements

2015-01-09 12:01:26 -05:00

templates

fixing styling and class syntax (to new FA-based classes) for missing UI elements

2015-01-09 12:01:26 -05:00

test

Merge pull request #6447 from edx/markhoeber-doc1437

2015-01-12 12:11:32 -05:00

.gitignore

…