Resolve .gitignore merge conflict with master
This commit is contained in:
@@ -11,3 +11,7 @@
|
||||
.env
|
||||
/services/caddy/logs*
|
||||
.env.old
|
||||
/.tmp/
|
||||
/.env.staging
|
||||
|
||||
/services/nginx/app/storage/replication-bootstrap.json
|
||||
|
||||
Reference in New Issue
Block a user