Merge branch 'master' into dev

d4rken · Mar 26, 2018 · 2501197 · 2501197
2 parents 85cde21 + 9b11502
commit 2501197
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,6 @@
+Contributions are very welcome, but please take note of the following points:
+
+* Send your pull-request against the dev branch
+* Continious integration will test your code, make sure all tests pass
+* Adhere to the projects current code style
+* Try to add unit-tests for your new code