x
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release

Conflicts:
	lms/templates/discussion/_underscore_templates.html