Merge branch 'dev' into rc

2019-01-06 19:38:23 +01:00
parent 1ad65516cf
commit 4046a16d85
227 changed files with 11196 additions and 3511 deletions
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -3,4 +3,4 @@ FROM python:2.7
 COPY requirements.txt /requirements.txt

 RUN pip install -r /requirements.txt && \
-    pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow
+    pip install flake8==3.6.0 pylint==1.9.4 pillow