Skip to content

Commit

Permalink
Merge branch 'release/2.0.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
alexkingorg committed Mar 20, 2012
2 parents a7ea828 + f3668bc commit 63d104a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Contributors: crowdfavorite, alexkingorg
Tags: comments, facebook, twitter
Requires at least: 3.2
Tested up to: 3.3rc1
Stable tag: 2.0
Tested up to: 3.3.1
Stable tag: 2.0.1

Broadcast posts to Twitter and/or Facebook, pull in items from each as comments, and allow commenters to use their Twitter/Facebook identities.

Expand Down Expand Up @@ -256,6 +256,11 @@ For a more in-depth look at what you need to be aware of when upgrading from 1.x

## Changelog

**2.0.1**

* Localization fixes (props thomasclausen)
* Minor bug fixes

**2.0**

* Complete re-write for improved reliability and ease of future expansion.
Expand Down
8 changes: 6 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: crowdfavorite, alexkingorg
Tags: comments, facebook, twitter
Requires at least: 3.2
Tested up to: 3.3rc1
Stable tag: 2.0
Tested up to: 3.3.1
Stable tag: 2.0.1

Broadcast posts to Twitter and/or Facebook, pull in items from each as comments, and allow commenters to use their Twitter/Facebook identities.

Expand Down Expand Up @@ -256,6 +256,10 @@ For a more in-depth look at what you need to be aware of when upgrading from 1.x

== Changelog ==

= 2.0.1 =
* Localization fixes (props thomasclausen)
* Minor bug fixes

= 2.0 =
* Complete re-write for improved reliability and ease of future expansion.
* Enables broadcasting to Facebook Pages.
Expand Down
4 changes: 2 additions & 2 deletions social.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: Social
Plugin URI: http://mailchimp.com/social-plugin-for-wordpress/
Description: Broadcast newly published posts and pull in discussions using integrations with Twitter and Facebook. Brought to you by <a href="http://mailchimp.com">MailChimp</a>.
Version: 2.0
Version: 2.0.1
Author: Crowd Favorite
Author URI: http://crowdfavorite.com/
*/
Expand All @@ -25,7 +25,7 @@ final class Social {
/**
* @var string version number
*/
public static $version = '2.0';
public static $version = '2.0.1';

/**
* @var string CRON lock directory.
Expand Down

0 comments on commit 63d104a

Please sign in to comment.