Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable...

Marius Burkard

2016-03-02 65ee075f32c58e35d3b660006bceaad9f6a2a4d8

Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable-3.1

 CONTRIBUTING.md

File was renamed from CODING_NOTES.php.txt
@@ -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