Feanil Patel 5e5c59cab2 Merge remote-tracking branch 'origin/release' ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.

2014-02-03 16:39:40 -05:00

..

djangoapps

Merge pull request #2388 from cpennington/initial-languages

2014-02-03 11:52:32 -08:00

lib

Merge remote-tracking branch 'origin/release'

2014-02-03 16:39:40 -05:00

static

Merge pull request #2377 from edx/gprice/forum-thread-pagination

2014-02-03 08:55:20 -08:00

templates

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

test

Merge remote-tracking branch 'origin/release'

2014-02-03 16:39:40 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…