Merge branch 'master' into 2.x

pcfreak30 · May 4, 2016 · 7219676 · 7219676
2 parents f3b5592 + 36c1399
commit 7219676
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/init.php b/init.php
@@ -3,13 +3,13 @@
 Plugin Name: Pods - Custom Content Types and Fields
 Plugin URI: http://pods.io/
 Description: Pods is a framework for creating, managing, and deploying customized content types and fields
-Version: 2.6.5-a-1
+Version: 2.6.5
 Author: Pods Framework Team
 Author URI: http://pods.io/about/
 Text Domain: pods
 Domain Path: /languages/
 GitHub Plugin URI: https://github.com/pods-framework/pods
-GitHub Branch: 2.x
+GitHub Branch: master
 
 Copyright 2009-2015  Pods Foundation, Inc  (email : contact@podsfoundation.org)
 
@@ -39,7 +39,7 @@
 }
 else {
     // Current version
-    define( 'PODS_VERSION', '2.6.5-a-1' );
+    define( 'PODS_VERSION', '2.6.5' );
 
     // Version tracking between DB updates themselves
     define( 'PODS_DB_VERSION', '2.3.5' );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pods",
-  "version": "2.6.5-a-1",
+  "version": "2.6.5",
   "description": "Pods is a development framework for creating, extending, managing, and deploying customized content types in WordPress.",
   "author": "Pods Foundation, Inc",
   "homepage": "http://pods.io/",

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: http://podsfoundation.org/donate/
 Tags: pods, custom post types, custom taxonomies, user fields, custom fields, cck, cms, content types, database, framework, drupal, post types, avatars, comment fields, media fields
 Requires at least: 3.8
 Tested up to: 4.5
-Stable tag: 2.6.5-a-1
+Stable tag: 2.6.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -166,6 +166,10 @@ Join us in further translating the Pods interface at: http://wp-translate.org/pr
 
 == Changelog ==
 
+= 2.6.5 - May 3rd, 2016 =
+* Fixed: Renaming of Pods with underscores to hyphenated names that was introduced in 2.6.3. Hyphenated Pods names will remain hyphenated and Underscored Pods names will remain underscored. Fixes (#3499). [@sc0ttkclark]
+* Fixed: Support for new Polylang Versions with much kudos to @JoryHogeveen for tackling this (#3491). Fixes (#3490,#3223) [@JoryHogeveen]
+
 = 2.6.4 - April 25th, 2016 =
 * Fixed: Modified Run activation/install priority to fire before plugins loaded. Fix for the Clearing Pods Cache automatically after Pods Upgrade (#3487). Fixes (#2558,#3348) [@sc0ttkclark]