Merge branch 'release' into master

5dad4e04 · Xavier Antoviaque · e5dd2f2c · 11db51c7 · 5dad4e04
Commit 5dad4e04 authored Jan 22, 2015 by Xavier Antoviaque
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

requirements/edx/custom.txt
+1 -1

No files found.
--- a/requirements/edx/custom.txt
+++ b/requirements/edx/custom.txt
 # Custom requirements to be customized by individual OpenEdX instances

 -e git+https://github.com/edx-solutions/xblock-utils.git@7d7201fb2b0bfc8e5d13905d1cedf88335ab4a93#egg=xblock-utils
-e git+https://github.com/edx-solutions/xblock-mentoring.git@c575de1a66bbde98a7513bf61bf2adcd04302474#egg=xblock-mentoring
+-e git+https://github.com/edx-solutions/xblock-mentoring.git@a8838b80f65a4d2066f523a31bdca69f05c89ad5#egg=xblock-mentoring
 -e git+https://github.com/edx-solutions/xblock-image-explorer.git@21b9bcc4f2c7917463ab18a596161ac6c58c9c4a#egg=xblock-image-explorer
 -e git+https://github.com/edx-solutions/xblock-drag-and-drop.git@92ee2055a16899090a073e1df81e35d5293ad767#egg=xblock-drag-and-drop
 -e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2.git@4482aa60643288943123fe589fab14a7f60cdc69#egg=xblock-drag-and-drop-v2