Merge branch 'master' into develop

godaddy-wordpress · May 24, 2018 · bfe5f1d · bfe5f1d
2 parents 2c84098 + 98cee0f
commit bfe5f1d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.dev/sass/style.scss b/.dev/sass/style.scss
@@ -4,7 +4,7 @@
  * Author: GoDaddy
  * Author URI: https://www.godaddy.com/
  * Description: Activation is a Primer child theme with a colorful, fitness-focused design.
- * Version: 1.2.0
+ * Version: 1.2.1
  * License: GPL-2.0
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: activation

diff --git a/functions.php b/functions.php
@@ -7,7 +7,7 @@
  *
  * @var string
  */
-define( 'PRIMER_CHILD_VERSION', '1.2.0' );
+define( 'PRIMER_CHILD_VERSION', '1.2.1' );
 
 /**
  * Move some elements around.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "activation",
   "title": "Activation",
   "description": "Activation is a Primer child theme with a colorful, fitness-focused design.",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "author": "GoDaddy",
   "license": "GPL-2.0",
   "repository": "godaddy/wp-activation-theme",

diff --git a/readme.md b/readme.md
@@ -3,7 +3,7 @@
 **Tags:**              [custom-background](https://wordpress.org/themes/tags/custom-background/), [custom-colors](https://wordpress.org/themes/tags/custom-colors/), [custom-header](https://wordpress.org/themes/tags/custom-header/), [custom-menu](https://wordpress.org/themes/tags/custom-menu/), [editor-style](https://wordpress.org/themes/tags/editor-style/), [featured-images](https://wordpress.org/themes/tags/featured-images/), [flexible-header](https://wordpress.org/themes/tags/flexible-header/), [left-sidebar](https://wordpress.org/themes/tags/left-sidebar/), [one-column](https://wordpress.org/themes/tags/one-column/), [right-sidebar](https://wordpress.org/themes/tags/right-sidebar/), [rtl-language-support](https://wordpress.org/themes/tags/rtl-language-support/), [sticky-post](https://wordpress.org/themes/tags/sticky-post/), [threaded-comments](https://wordpress.org/themes/tags/threaded-comments/), [three-columns](https://wordpress.org/themes/tags/three-columns/), [translation-ready](https://wordpress.org/themes/tags/translation-ready/), [two-columns](https://wordpress.org/themes/tags/two-columns/)  
 **Requires at least:** 4.4  
 **Tested up to:**      4.9  
-**Stable tag:**        1.2.0  
+**Stable tag:**        1.2.1  
 **License:**           GPL-2.0  
 **License URI:**       https://www.gnu.org/licenses/gpl-2.0.html  
 

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors:      godaddy, jonathanbardo, fjarrett, eherman24
 Tags:              custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, left-sidebar, one-column, right-sidebar, rtl-language-support, sticky-post, threaded-comments, three-columns, translation-ready, two-columns
 Requires at least: 4.4
 Tested up to:      4.9
-Stable tag:        1.2.0
+Stable tag:        1.2.1
 License:           GPL-2.0
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 

diff --git a/style-rtl.css b/style-rtl.css
@@ -4,7 +4,7 @@
  * Author: GoDaddy
  * Author URI: https://www.godaddy.com/
  * Description: Activation is a Primer child theme with a colorful, fitness-focused design.
- * Version: 1.2.0
+ * Version: 1.2.1
  * License: GPL-2.0
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: activation

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@
  * Author: GoDaddy
  * Author URI: https://www.godaddy.com/
  * Description: Activation is a Primer child theme with a colorful, fitness-focused design.
- * Version: 1.2.0
+ * Version: 1.2.1
  * License: GPL-2.0
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: activation