aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAubrey-Li <63608597+Aubrey-Li@users.noreply.github.com>2021-07-31 12:46:59 -0700
committerAubrey-Li <63608597+Aubrey-Li@users.noreply.github.com>2021-07-31 12:46:59 -0700
commit23f5f7362cb8deaaff805cd6b8dc0c8ae9e2f3b7 (patch)
treeb91e6ffe50433184fbc55b0271729d721fcf4737 /.gitignore
parentd470a08e9ce329f1a6ff9a4591c41e1e04fb62bb (diff)
parent41ccf50f2b551edd6827c9fd6296b9ff87a65915 (diff)
Merge branch 'master' into trails-aubrey
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