Merge pull request #270 from traPtitech/master

Update v1.2.0
traPtitech · Nov 28, 2019 · 1ed2e4d · 1ed2e4d
2 parents 13b1ed5 + 9d1b014
commit 1ed2e4d
Show file tree

Hide file tree

Showing 41 changed files with 1,437 additions and 382 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -4,4 +4,6 @@ README.md
 Dockerfile
 docker-compose.yml
 .dockerignore
-.gitignore
+.gitignore
+!/uploads/.gitkeep
+/uploads/*
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@ booQ
 /tmp/
 .DS_Store
 /.env
+
+!/uploads/.gitkeep
+/uploads/*