aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAubrey-Li <63608597+Aubrey-Li@users.noreply.github.com>2021-07-31 22:16:18 -0700
committerAubrey-Li <63608597+Aubrey-Li@users.noreply.github.com>2021-07-31 22:16:18 -0700
commit871205c74367b333eb59c3941be000092cab5e0d (patch)
treed367a8c9a9a4e9a2b4e8e793ff78e92ef994a514 /.gitignore
parent7e11e24fcdd9c086d63c643d6ee092c952d2e327 (diff)
parentb1361eec6d3f554d4927931c339b5c169b9a54a7 (diff)
Merge branch 'master' into aubrey-bugfix
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 43b63a362..7a3c82ee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ src/server/session_manager/logs/**/*.log
*.pfx
*.properties
debug.log
-.vscodeignore \ No newline at end of file
+.vscodeignore
+Dockerfile