Merge branch 'master' into develop

lgrahl · lgrahl · commit ea957d2a7e40 · 2017-05-12T21:10:15.000+02:00
Conflicts:
	threema/gateway/__init__.py
	threema/gateway/bin/gateway_client.py
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,6 @@ target/
 out
 gen
 # Created by .ignore support plugin (hsz.mobi)
+
+# Vim
+*.swp

-Original file line number
+Diff line change
 out
 gen
 # Created by .ignore support plugin (hsz.mobi)
++
 +# Vim
 +*.swp