Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

djangoapps

Merge branch 'release'

2014-01-16 12:51:22 -05:00

lib

Merge branch 'release'

2014-01-16 12:51:22 -05:00

static

Internationalize our use of jquery.timeago

2014-01-15 16:46:38 -05:00

templates

remove unused jasmine resources

2013-11-07 12:04:35 -05:00

test

Refactored bok-choy directory structure

2014-01-15 09:37:32 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…