[MERGE] forward port branch saas-17 up to 4a878fa4dc

2017-09-14 11:45:54 +02:00
parent ad79fed261 4a878fa4dc
commit 97a9384c3e
2 changed files with 2 additions and 1 deletions
@@ -7,6 +7,7 @@ _build/
 !.mailmap
 # compiled python files
 *.py[co]
+__pycache__/
 # setup.py egg_info
 *.egg-info
 # emacs backup files
@@ -37,5 +37,5 @@ vatnumber==1.2
 vobject==0.9.3
 Werkzeug==0.11.11
 XlsxWriter==0.9.3
-xlwt==1.1.2
+xlwt==1.3.*
 xlrd==1.0.0