Merge branch 'master' of github.com:plone/jenkins.plone.org

Conflicts: docs/source/setup.rst
plone · Feb 13, 2015 · 453e1be · 453e1be
2 parents 2e298bd + 5cb66cb
commit 453e1be
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/source/setup.rst b/docs/source/setup.rst
@@ -53,6 +53,7 @@ Set Up Jenkins Nodes
 
   $ ansible-playbook -i inventory jenkins_nodes.yml
 
+
 Set Up Jenkins Jobs
 -------------------