Merge branch 'master' of github.com:spryker/spryker into feature/cc-1…

…0770/master-improve-password-security
spryker · Nov 20, 2020 · be73a69 · be73a69
2 parents 0981a62 + 31416f2
commit be73a69
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,8 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text text=auto eol=lf
 
+*.php diff=php
+
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary