Merge pull request #13254 from edx/release

Release
This commit is contained in:
Albert (AJ) St. Aubin
2016-08-17 11:30:41 -04:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@@ -98,6 +98,7 @@ cms/static/sass/*.css
cms/static/sass/*.css.map
cms/static/themed_sass/
themes/**/css/*.css
themes/**/css/discussion/*.css
### Logging artifacts
log/

View File

@@ -97,4 +97,4 @@ git+https://github.com/edx/edx-proctoring.git@0.12.21#egg=edx-proctoring==0.12.2
# Third Party XBlocks
-e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga
-e git+https://github.com/open-craft/xblock-poll@v1.1#egg=xblock-poll==1.1
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.7#egg=xblock-drag-and-drop-v2==2.0.7
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.0.8#egg=xblock-drag-and-drop-v2==2.0.8