Merge branch 'master' into develop

carlio · carlio · commit a21a42e5f0ba · 2016-06-16T12:48:21.000+02:00
diff --git a/setup.py b/setup.py
@@ -61,5 +61,6 @@
     install_requires=_install_requires,
     license='GPLv2',
     classifiers=_classifiers,
-    keywords='pylint django plugin'
+    keywords='pylint django plugin',
+    zip_safe=False,
 )

Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,6 @@`
`61`	`61`	`install_requires=_install_requires,`
`62`	`62`	`license='GPLv2',`
`63`	`63`	`classifiers=_classifiers,`
`64`		`- keywords='pylint django plugin'`
	`64`	`+ keywords='pylint django plugin',`
	`65`	`+ zip_safe=False,`
`65`	`66`	`)`