Merge branch '2.1' of git@github.com:LimeSurvey/LimeSurvey.git into 2.1

LimeSurvey · Dec 16, 2012 · ec3514f · ec3514f
2 parents f20f07a + 75a823d
commit ec3514f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,7 +3,14 @@
 
 # Declare files that will always have LF line endings on checkout.
 *.php text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+*.pstpl text eol=lf
+*.html text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
+*.jpg binary
 *.png binary
+*.gif binary
+*.ico binary
 *.mo binary