Merge branch 'release' into master

b1324d3e · Xavier Antoviaque · 7c5e0c05 · 6567b83f · b1324d3e
Commit b1324d3e authored Nov 05, 2014 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@4861c7f9bfc734076a1efb969f14dfb253415bf1#egg=xblock-mentoring
+-e git+https://github.com/edx-solutions/xblock-mentoring.git@06cb8c28733743f032e1af97bc774c9aa7191747#egg=xblock-mentoring
 -e git+https://github.com/edx-solutions/xblock-image-explorer.git@75cc9bb16271789e9722d8dd011d8e650eae57af#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@e6743a57e89c6dcbba997b43ad9c46572a7a8fb9#egg=xblock-drag-and-drop-v2