Merge branch 'release/1.4.1'

crowdfavorite · Nov 13, 2013 · 64fd7e0 · 64fd7e0
2 parents cae0afc + 358b373
commit 64fd7e0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,8 +1,12 @@
 # FavePersonal
 
-## Version 1.4
+## Version 1.4.1
 
 - (announce) First release on WordPress.org
+- (change) Update the included Post Formats Admin UI plugin to version 1.2
+
+## Version 1.4
+
 - (feature) Add ability to insert shortcodes in Bio Widget
 - (feature) Include Carrington Core v3.7
 - (change) Gallery navigation arrows now match bio widget arrows.

diff --git a/functions.php b/functions.php
@@ -37,14 +37,14 @@
 /**
  * Theme version.
  */
-define('CFCT_THEME_VERSION', '1.4');
+define('CFCT_THEME_VERSION', '1.4.1');
 
 /**
  * Theme URL version.
  * Added to query var at the end of assets to force browser cache to reload after upgrade.
  */
 if (!(defined('CFCT_URL_VERSION'))) {
-	define('CFCT_URL_VERSION', '5');
+	define('CFCT_URL_VERSION', '6');
 }
 
 /**

diff --git a/plugins/cf-post-formats b/plugins/cf-post-formats
diff --git a/style.css b/style.css
@@ -1,8 +1,8 @@
 /** 
  * Theme Name: FavePersonal
  * Theme URI: http://crowdfavorite.com/favepersonal/
- * Description: A personal and customizable theme perfect for your personal site. Customizable colors with Adobe Kuler, social network integrations, baked-in mobile and tablet device support, unique post format display styles and much more.
- * Version: 1.4
+ * Description: A personal and customizable theme perfect for your personal site. Customizable colors from COLOURlovers, social network integrations, baked-in mobile and tablet device support, unique post format display styles and much more.
+ * Version: 1.4.1
  * Author: Crowd Favorite
  * Author URI: http://crowdfavorite.com/
  * License: GNU General Public License