Merge branch 'release/3.3.1' into develop

crowdfavorite · Feb 14, 2012 · 7ba9a41 · 7ba9a41
2 parents d5a408a + 5c55379
commit 7ba9a41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,10 @@
 
 - Remove archive/category posts per page default override (can be re-enabled by theme).
 
+## 3.3.1
+
+- Update header code option name to match that used in wp_head filter
+
 ## 3.3
 
 - Implemented support for feed-{post context} templates in content/ and excerpt/ dirs

diff --git a/carrington.php b/carrington.php
@@ -20,7 +20,7 @@
 // 	ini_set('display_errors', '1');
 // 	ini_set('error_reporting', E_ALL);
 
-define('CFCT_CORE_VERSION', '3.3');
+define('CFCT_CORE_VERSION', '3.3.1');
 
 // Path to Carrington Core parent directory (usually the theme).
 if (!defined('CFCT_PATH')) {