Commit af06dd94 by Tom Giannattasio

Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki

parents 411fcfd0 90eeaa05
...@@ -44,5 +44,5 @@ django-ses ...@@ -44,5 +44,5 @@ django-ses
django-storages django-storages
django-threaded-multihost django-threaded-multihost
django-sekizai<0.7 django-sekizai<0.7
git+git://github.com/benjaoming/django-wiki.git@473fd5e git+git://github.com/benjaoming/django-wiki.git@d4de685
-r repo-requirements.txt -r repo-requirements.txt
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment