Merge branch 'develop'

Automattic · Feb 14, 2012 · 63dcbd3 · 63dcbd3
2 parents 0a75221 + 1ebff24
commit 63dcbd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ad-code-manager.php b/ad-code-manager.php
@@ -4,7 +4,7 @@
 Plugin URI: http://automattic.com
 Description: Easy ad code management
 Author: Daniel Bachhuber, Automattic, Rinat Khaziev, doejo
-Version: 0.1.2
+Version: 0.1.3
 Author URI: http://automattic.com
 
 GNU General Public License, Free Software Foundation <http://creativecommons.org/licenses/GPL/2.0/>

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: danielbachhuber, rinatkhaziev, automattic
 Tags: advertising, ad codes
 Requires at least: 3.1
 Tested up to: 3.3.1
-Stable tag: 0.1.2
+Stable tag: 0.1.3
 
 Manage your ad codes through the WordPress admin in a safe and easy way.
 
@@ -176,8 +176,8 @@ function my_acm_whiltelisted_script_urls( $whitelisted_urls ) {
 
 == Changelog ==
 
-= 0.1.3 (February 10, 2012) =
-* UI cleanup
+= 0.1.3 (February 13, 2012) =
+* UI cleanup for the admin, including styling and information on applying conditionals
 
 = 0.1.2 (February 9, 2012) =
 * Readme with full description and examples