Skip to content

Commit 8315a38

Browse files
authored
Merge pull request laradock#662 from zeroc0d3/master
Fixing environment in docker-compose file
2 parents 09c5ad2 + 6abea87 commit 8315a38

8 files changed

Lines changed: 270 additions & 272 deletions

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ charset = utf-8
99

1010
[{Dockerfile,docker-compose.yml}]
1111
indent_style = space
12-
indent_size = 4
12+
indent_size = 2

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea
22
/logs
33
/data
4-
.env
4+
.env
5+
/.project

DOCUMENTATION/_settings/content/getting-started/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Your folder structure should look like this:
8282
*Or you can keep `default.conf` as it is, and create a separate config `my-site.conf` file for it.*
8383

8484
**In case of Apache:** :P
85+
8586
<br>
8687

8788

0 commit comments

Comments
 (0)