Merge branch 'develop' into stable

HashBrownCMS · Jan 4, 2020 · 35f45f4 · 35f45f4
2 parents 45dae12 + e5e9396
commit 35f45f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ package-lock.json
 .sass-cache/*
 /docker/db/*
 /docker/remote
+/docker/.env
 
 # Storage directories
 /storage/*

diff --git a/docker/.env b/docker/.env