aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authormehekj <mehek.jethani@gmail.com>2021-07-31 15:39:27 -0400
committermehekj <mehek.jethani@gmail.com>2021-07-31 15:39:27 -0400
commit2e1f7c626306a054c036c91a98e5dabee3b39ef8 (patch)
tree9a08876f93ecffbcc5f2cbd31b0797289fb188d2 /.gitignore
parent11e95e35cde6e0c2390380975327f20eb5f3d1a4 (diff)
parent41ccf50f2b551edd6827c9fd6296b9ff87a65915 (diff)
Merge branch 'master' into temporalmedia-mehek
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