Merge branch 'stable-3.1'

Marius Burkard · Marius Burkard · commit fb41e2139d57 · 2016-03-02T11:48:45.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+*.php text eol=lf
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-Some guidelines for web development with PHP.
+# Some guidelines for web development with php.
 -----------------------------------------------------
 * Unix Line Breaks Only, NO windows breaks please.
 * Tabs to indent lines, NO spaces

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Some guidelines for web development with PHP.`
	`1`	`+# Some guidelines for web development with php.`
`2`	`2`	`-----------------------------------------------------`
`3`	`3`	`* Unix Line Breaks Only, NO windows breaks please.`
`4`	`4`	`* Tabs to indent lines, NO spaces`