Merge branch 'master' of github.com:lemoineat/python-zulip-api

latnr · latnr · commit 2cb9f9ac636e · 2020-08-31T09:33:32.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
   "python.pythonPath": "zulip-api-py3-venv/bin/python3.7"
-}
+}
diff --git a/zulip_bots/zulip_bots/bots/bugzilla/fixtures/test_comment.json b/zulip_bots/zulip_bots/bots/bugzilla/fixtures/test_comment.json
@@ -14,4 +14,4 @@
     "status": 200,
     "content-type": "application/json; charset=utf-8"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`	`2`	`"python.pythonPath": "zulip-api-py3-venv/bin/python3.7"`
`3`		`-}`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`"status": 200,`
`15`	`15`	`"content-type": "application/json; charset=utf-8"`
`16`	`16`	`}`
`17`		`-}`
	`17`	`+}`