framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into grunt

Browse Source
This commit is contained in:
Ben Word
2013-02-08 10:11:02 -06:00
parent d11b6ab363 3875728c32
commit 135aded63f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,4 +1,4 @@
### HEAD ### 6.3.0: February 8th, 2013
* Update to Bootstrap 2.3.0 * Update to Bootstrap 2.3.0
* Update to jQuery 1.9.1 * Update to jQuery 1.9.1
* Output author title with `get_the_author()` * Output author title with `get_the_author()`

4
style.css
View File

@@ -2,10 +2,10 @@
Theme Name: Roots Theme Name: Roots
Theme URI: http://www.rootstheme.com/ 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> 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: Ben Word
Author URI: http://benword.com/ Author URI: http://benword.com/
License: MIT License License: MIT License
License URI: http://opensource.org/licenses/MIT License URI: http://opensource.org/licenses/MIT
*/ */