Merge branch 'pr/remove_devel_from_gitguide'

alexsorinpop · Sep 18, 2014 · b199826 · b199826
2 parents 2f9015a + 87c721f
commit b199826
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -4,7 +4,7 @@
     * GH #667: Fix typo in cookbook pod. (Lindsey Beesley) 
     * GH #649, #670: Document core logger. (simbabque)
     * GH #689: Git guide markdown fixes. (Paul Cochrane)
-    * GH #691: Doc cleanups. (Paul Cochrane)
+    * GH #690, #691: Doc cleanups. (Paul Cochrane)
 
 0.150000  2014-08-17 01:35:16CEST+0200 Europe/Amsterdam
 

diff --git a/GitGuide.md b/GitGuide.md
@@ -172,10 +172,9 @@ these contributions and applying them much, much easier. This gives
 your contribution a much better chance of being integrated into
 Dancer2 quickly!
 
-**NOTE:** unlike before, we no longer use the _devel_ branch. All
-active development is performed in the _master_ branch. Therefore, all
-your contribution work should be done in a fork of the _master_
-branch.
+**NOTE:** All active development is performed in the _master_ branch.
+Therefore, all your contribution work should be done in a fork of the
+_master_ branch.
 
 Here is the workflow for submitting a patch: