developブランチマージ

This commit is contained in:
rinsuki 2019-10-19 04:43:08 +09:00
parent 7555c4778a
commit b34ae35803
403 changed files with 9381 additions and 3276 deletions

8
.gitignore vendored
View file

@ -1,5 +1,6 @@
# Visual Studio Code
/.vscode
!/.vscode/extensions.json
# Intelij-IDEA
/.idea
@ -29,3 +30,10 @@ api-docs.json
.DS_Store
/files
ormconfig.json
# blender backups
*.blend1
*.blend2
*.blend3
*.blend4
*.blend5