Skip to content

Commit

Permalink
Merge in master
Browse files Browse the repository at this point in the history
  • Loading branch information
fjarrett-godaddy committed Dec 8, 2016
2 parents 5b36b6d + 88b9d75 commit 324d34e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions godaddy-email-marketing.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: GoDaddy Email Marketing Signup Forms
* Plugin URI: https://gem.godaddy.com/
* Description: Add the GoDaddy Email Marketing signup form to your WordPress site! Easy to set up, the plugin allows your site visitors to subscribe to your email lists.
* Version: 1.1.3
* Version: 1.1.4
* Author: GoDaddy
* Author URI: https://gem.godaddy.com/
* License: GPL-2.0
Expand Down Expand Up @@ -108,7 +108,7 @@ private function setup_constants() {

// Plugin's main directory.
defined( 'GEM_VERSION' )
or define( 'GEM_VERSION', '1.1.3' );
or define( 'GEM_VERSION', '1.1.4' );

// Set up the base name.
isset( self::$basename ) || self::$basename = plugin_basename( __FILE__ );
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "godaddy-email-marketing-sign-up-forms",
"version": "1.1.3",
"version": "1.1.4",
"author": "GoDaddy",
"license": "GPL-2.0",
"repository": "godaddy/wp-godaddy-email-marketing",
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Add the GoDaddy Email Marketing plugin to your WordPress site! Easy to set up, t
**Tags:** [email](https://wordpress.org/plugins/tags/email), [forms](https://wordpress.org/plugins/tags/forms), [godaddy](https://wordpress.org/plugins/tags/godaddy), [mailing list](https://wordpress.org/plugins/tags/mailing list), [marketing](https://wordpress.org/plugins/tags/marketing), [newsletter](https://wordpress.org/plugins/tags/newsletter), [opt-in](https://wordpress.org/plugins/tags/opt-in), [signup](https://wordpress.org/plugins/tags/signup), [subscribe](https://wordpress.org/plugins/tags/subscribe), [widget](https://wordpress.org/plugins/tags/widget), [contacts](https://wordpress.org/plugins/tags/contacts)
**Requires at least:** 3.8
**Tested up to:** 4.5
**Stable tag:** 1.1.3
**Stable tag:** 1.1.4
**License:** [GPL-2.0](https://www.gnu.org/licenses/gpl-2.0.html)

[![Build Status](https://travis-ci.org/godaddy/wp-godaddy-email-marketing.svg?branch=master)](https://travis-ci.org/godaddy/wp-godaddy-email-marketing) [![Coverage Status](https://coveralls.io/repos/godaddy/wp-godaddy-email-marketing/badge.svg?branch=master)](https://coveralls.io/github/godaddy/wp-godaddy-email-marketing) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com) [![devDependency Status](https://david-dm.org/godaddy/wp-godaddy-email-marketing/dev-status.svg)](https://david-dm.org/godaddy/wp-godaddy-email-marketing#info=devDependencies)
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: godaddy, humanmade, xwp, fjarrett, jonathanbardo
Tags: email, forms, godaddy, mailing list, marketing, newsletter, opt-in, signup, subscribe, widget, contacts
Requires at least: 3.8
Tested up to: 4.5
Stable tag: 1.1.3
Tested up to: 4.7
Stable tag: 1.1.4
License: GPL-2.0
License URI: https://www.gnu.org/licenses/gpl-2.0.html

Expand Down

0 comments on commit 324d34e

Please sign in to comment.