From fb41e2139d572d66b9ee2578d23fe0724534da6b Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:48:45 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

---
 CONTRIBUTING.md |    2 +-
 .gitattributes  |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..7e51847
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+*.php text eol=lf
\ No newline at end of file
diff --git a/CODING_NOTES.php.txt b/CONTRIBUTING.md
similarity index 98%
rename from CODING_NOTES.php.txt
rename to CONTRIBUTING.md
index 88afcef..dd49a14 100644
--- a/CODING_NOTES.php.txt
+++ 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

--
Gitblit v1.9.1