Merge branch 'master' of https://github.com/buxx/synergine2

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Bastien Sevajol
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

requirements.txt

@@ -6,7 +6,7 @@ future==0.16.0
 numpy==1.14.5
 pluggy==0.6.0
 psutil==5.4.6
-py==1.5.3
+py==1.5.4
 pyglet==1.3.2
 pytest==3.6.2
 python-dateutil==2.7.3
@@ -15,4 +15,4 @@ redis==2.10.6
 six==1.11.0
 tmx==1.9.1
 pytest-mock==1.10.0
-Pillow==5.1.0
+Pillow==5.2.0