Merge branch 'dev' of source.ijs.si:mothra into dev
Conflicts: requirements.txt
Showing
... | ... | @@ -8,7 +8,7 @@ django-orderable-inlines==0.0.6 |
django-picklefield==0.2.1 | ||
httplib2==0.7.5 | ||
wsgiref==0.1.2 | ||
mysql-connector-python>=1.0.9 | ||
mysql-connector-python==1.0.12 | ||
numpy==1.7.1 | ||
pydot==1.0.28 | ||
pyparsing==1.5.7 | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment