Hotfix

[irc/freenode/web-7.0.git] / CONTRIBUTE.md

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index 4e4c92ad96794de09fc8833ff5fe0b9e1cc3b113..a143a9e86c781fe5930431a407b42892b0af82c3 100644 (file)
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -6,14 +6,15 @@
 ## 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
+* 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.
+except for hotfix- there should be left rich with time (+3h) from PR open to PR merge for discusiion
 
 ## 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
+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