Code

Adam/merge release 2#3113

Code

Merged

adampalay merged 3 commits intomasteropenedx/edx-platform:masterfrom adam/merge-release-2openedx/edx-platform:adam/merge-release-2Copy head branch name to clipboardMar 28, 2014

-1

Commits

Commits on Mar 28, 2014

• temporarily remove SR on capa alerts to fix problem submissions (LMS-2474)

  adampalay

  committed
  8e01f17

  Copy full SHA for 8e01f17

• Merge pull request #3105 from edx/adam/hotifx-js

  Show description for 94966a0
  adampalay

  committed
  94966a0

  Copy full SHA for 94966a0

• Merge remote-tracking branch 'origin/release' into adam/merge-release-2

  adampalay

  committed
  c674337

  Copy full SHA for c674337