Dennis Jen 47f3252215 Merge pull request #6529 from edx/release ...

Merge release back into master

2015-01-09 17:22:15 -05:00

..

djangoapps

Merge pull request #6515 from edx/talbs/fix-update-font-awesome

2015-01-09 12:50:14 -05:00

lib

Merge pull request #6529 from edx/release

2015-01-09 17:22:15 -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 #6522 from edx/zoldak/video-troubleshooting

2015-01-09 16:21:07 -05:00

.gitignore

…