Merge branch 'master' of https://github.com/rackerlabs/canon-jenkins

Bring in README.md content Conflicts: README.md
daniilyar · Sep 8, 2013 · 1f9161b · 1f9161b
2 parents b691d09 + 8dfe36f
commit 1f9161b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Canon for Jenkins
+# Jenkins Rackspace Canon(tm) Theme
 
 CSS and JS to implement [Rackspace Canon](http://canon.rackspace.com/) as a theme for [Jenkins CI](http://jenkins-ci.org/).