Commit c9e32eaf authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Merge branch 'master' into psychology

parents 0589a856 98bcd334
......@@ -4,3 +4,4 @@ scipy
lxml
utm
numpy
gitpython
\ No newline at end of file
Supports Markdown
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