From: Svante Bengtson <redacted>
Date: Tue, 23 Feb 2016 18:28:16 +0000 (+0100)
Subject: Merge branch 'design' of github.com:freenode/web-7.0 into design
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/e6c9ef5cf5f7cf48f90834fa6efee190c27f0458?hp=e9725e628db76a4a3bac79a5fd81305751eb1442

Merge branch 'design' of github.com:freenode/web-7.0 into design
---

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
new file mode 100644
index 000000000..4e4c92ad9
--- /dev/null
+++ b/CONTRIBUTE.md
@@ -0,0 +1,19 @@
+## Dev Requirements:
+
+* [Myth](http://www.myth.io/)
+* [cms7](https://github.com/edk0/cms7)
+
+## Git
+
+* Master is whats on [freenode](https://freenode.net) please do only merge to this branch with permission from at least two of the following: spb, christel, mist, kloeri, edk or Swant
+* design/ prefix is for design changes of the website, ONE CHANGE PER BRANCH
+* template/ prefix is for template changes, ONE CHANGE PER BRANCH
+* content/ prefix is for new content, blogposts and faq md files, ONE ARTICLE PER BRANCH
+* hotfix/ prefix is for urgent bugs, these might be fast forwarded without deeper testing
+
+Branches should be tested on both big and small screens.
+No direct merges to master, use Pull Requests.
+
+## Editing Rules
+
+Do not edit static/css/style.css as it'll be overwritten on next compile, instead edit static/css/source.css and run myth static/css/source.css static/css/style.css
\ No newline at end of file