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 remote-tracking branch 'origin/release'

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

envs

Prep for initial language release

2014-02-03 13:35:56 -05:00

lib

Allow new response pagination parameters to pass through thread model.

2014-02-03 13:41:48 -05:00

static

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

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

templates

Add OG title and description to course about pages

2014-02-03 12:36:43 -08:00

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

startup.py

small bugfixes for theming+sass+templates

2014-01-13 15:28:35 -08:00

urls.py

annotation tools

2014-01-27 13:47:58 -05:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00