Adam Palay cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

2014-09-05 13:20:15 -04:00

..

view

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

2014-09-05 13:20:15 -04:00

content_spec.coffee

Allow authors of forum questions to mark answers

2014-08-29 15:59:32 -04:00

discussion_spec_helper.coffee

Implement forum cohort visibility labels correctly

2014-09-04 13:47:48 -04:00

utils_spec.coffee

Update UI for forum actions

2014-08-29 15:59:33 -04:00