aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicolasjon <nick@zbm2.com>2020-12-21 17:44:33 +0000
committernicolasjon <nick@zbm2.com>2020-12-21 17:44:33 +0000
commita98b8b7dbef5032ceefa2e085eca6c35d0d01fd0 (patch)
tree4a90f4b6e3fe290651d1cf4a661825fa307f2adf
parent41c5d66cba9549c0187f39fabe5e68c4ac1954d4 (diff)
parent287e50b9855dd2c29aaae2a235e407bbaf41cd06 (diff)
downloadchirp-a98b8b7dbef5032ceefa2e085eca6c35d0d01fd0.tar.gz
chirp-a98b8b7dbef5032ceefa2e085eca6c35d0d01fd0.tar.xz
Merge remote-tracking branch 'upstream/main' into main
Upstream merge
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 392a03d..83f74c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@
.tox
.eggs
logs
+
+# Vscode stuff
+.vscode