From 65ee075f32c58e35d3b660006bceaad9f6a2a4d8 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:48:33 -0500
Subject: [PATCH] Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable-3.1

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

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