update
This commit is contained in:
commit
0fd4e9d32a
2 changed files with 6 additions and 0 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -4,7 +4,10 @@
|
|||
/neodb.env
|
||||
/typings
|
||||
/upgrade
|
||||
<<<<<<< HEAD
|
||||
.compose.override.yml
|
||||
=======
|
||||
>>>>>>> b0ec90060ab08edd9f9fc48cd8125e82dedbafd3
|
||||
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
|
|
|
@ -93,7 +93,10 @@ x-shared:
|
|||
- ${NEODB_DATA:-../data}/takahe-cache:/www/cache
|
||||
- ${NEODB_DATA:-../data}/www-root:/www/root
|
||||
- ./custom/edition.custom.html:/neodb/catalog/templates/edition.html
|
||||
<<<<<<< HEAD
|
||||
- ./custom/common_libs.custom.html:/neodb/common/templates/common_libs.html
|
||||
=======
|
||||
>>>>>>> b0ec90060ab08edd9f9fc48cd8125e82dedbafd3
|
||||
depends_on:
|
||||
- redis
|
||||
- neodb-db
|
||||
|
|
Loading…
Add table
Reference in a new issue