Merge branch 'master' into grunt

2013-02-08 10:11:02 -06:00
parent d11b6ab363 3875728c32
commit 135aded63f
2 changed files with 3 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### HEAD
+### 6.3.0: February 8th, 2013
 * Update to Bootstrap 2.3.0
 * Update to jQuery 1.9.1
 * Output author title with `get_the_author()`
--- a/style.css
+++ b/style.css
@@ -2,10 +2,10 @@
 Theme Name:         Roots
 Theme URI:          http://www.rootstheme.com/
 Description:        Roots is a starting WordPress theme made for developers that's based on HTML5 Boilerplate and Bootstrap. <a href="https://github.com/retlehs/roots/contributors">Contribute on GitHub</a>
-Version:            6.2.0
+Version:            6.3.0
 Author:             Ben Word
 Author URI:         http://benword.com/

 License:            MIT License
 License URI:        http://opensource.org/licenses/MIT
-*/
+*/