Merge tag 'v2.6.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Oct 2016 19:37:12 +0000 (15:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Oct 2016 19:37:12 +0000 (15:37 -0400)
commit841c0eebe3029568c864b33f24b58a533de0cc6b
treebb6ea31708e008330d7c53c92d74ec42d8ad2fc7
parent6ec4d552b373eddcd3d9c74c1d475383b8e0a319
parentb55654b24fda0c28aae3a9a59132e0bd8112c088
Merge tag 'v2.6.2' into develop

Version 2.6.2
models/admin/pages/shortcode.php