Commit 27f2e08e authored by Administrator's avatar Administrator

Merge branch 'samuel' into unstable

parents 67aac38b 05557741
......@@ -61,3 +61,4 @@ sympy==0.7.5
tornado==4.0.1
uWSGI==2.0.7
ujson==1.33
jsonfield==1.0.3
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