Merge branch 'master' into develop

joeloudjinz · web-flow · commit f235a871c60e · 2019-06-06T15:45:04.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@ resources
 .jshintrc
 server/.eslintrc.js
 server/.env
-.env
+.env
