master #18

Merged
vincent merged 11 commits from master into dev 2020-06-06 09:06:21 +00:00
Showing only changes of commit 52c612c33e - Show all commits

View File

@ -16,6 +16,10 @@ pylint==2.3.1
six==1.12.0 six==1.12.0
soupsieve==1.9.1 soupsieve==1.9.1
typed-ast==1.4.0 typed-ast==1.4.0
<<<<<<< HEAD
Werkzeug==0.16.0 Werkzeug==0.16.0
=======
Werkzeug==0.15.2
>>>>>>> db15ccff764e95704cb9be68ecbdbad36f97ac5c
wrapt==1.11.1 wrapt==1.11.1