Merge branch 'learner' of git-st.inf.tu-dresden.de:OpenLicht/eraser into learner

e59964ae · René Schöne · cd308857 · cd59cdb6 · e59964ae · e59964ae
Commit e59964ae authored Jun 5, 2019 by René Schöne
--- a/venv/lib/python2.7/types.py
+++ b/venv/lib/python2.7/types.py
--- a/venv/lib/python2.7/types.pyc
+++ b/venv/lib/python2.7/types.pyc
--- a/venv/lib/python2.7/warnings.py
+++ b/venv/lib/python2.7/warnings.py
--- a/venv/lib/python2.7/warnings.pyc
+++ b/venv/lib/python2.7/warnings.pyc