Merge branch 'master' into 'master'

Master See merge request flectra-hq/flectra!67
2018-05-23 11:45:58 +00:00 · 2018-05-23 11:45:58 +00:00 · d8f980e192
commit d8f980e192
parent 0eee27005d e4f930ff24
2 changed files with 2 additions and 0 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -40,4 +40,5 @@ XlsxWriter==0.9.3
 xlwt==1.3.*
 xlrd==1.0.0
 unittest2==1.1.0
+numpy==1.14.3
 pypiwin32 ; sys_platform == 'win32'
--- a/setup/win32/winpy_requirements.txt
+++ b/setup/win32/winpy_requirements.txt
@ -37,3 +37,4 @@ Werkzeug>=0.11.11
 XlsxWriter==0.9.3
 xlwt==1.3.*
 xlrd==1.0.0
+numpy==1.14.3