Merge branch 'master' of github.com:MITx/mitx

2012-08-20 19:11:58 -04:00
parent c5aef50701 46c3e8a286
commit ef2bfac32a
2 changed files with 1 additions and 1 deletions
--- a/repo-requirements.txt
+++ b/repo-requirements.txt
@@ -1,5 +1,6 @@
 -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
 -e git://github.com/benjaoming/django-wiki.git@c145596#egg=django-wiki
+-e git://github.com/dementrock/pystache_custom.git#egg=pystache_custom
 -e common/lib/capa
 -e common/lib/xmodule
--- a/requirements.txt
+++ b/requirements.txt
@@ -43,5 +43,4 @@ django-storages
 django-threaded-multihost
 django-sekizai<0.7
 networkx
-pystache>=0.5.2
 -r repo-requirements.txt