Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
vvasilev- committed Nov 14, 2019
2 parents 77feefa + 2da132d commit 2e66fa0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Define version constant
if ( ! defined( __NAMESPACE__ . '\VERSION' ) ) {
define( __NAMESPACE__ . '\VERSION', '3.1.6' );
define( __NAMESPACE__ . '\VERSION', '3.1.7' );
}

# Define root directory
Expand Down
1 change: 1 addition & 0 deletions core/Container/Block_Container.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class Block_Container extends Container {
public $settings = array(
'preview' => true,
'parent' => null,
'icon' => 'block-default',
'inner_blocks' => array(
'enabled' => false,
'position' => 'above',
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": "carbon-fields",
"version": "3.1.6",
"version": "3.1.7",
"description": "WordPress developer-friendly custom fields for post types, taxonomy terms, users, comments, widgets, options, navigation menus and more.",
"directories": {
"test": "tests"
Expand Down

0 comments on commit 2e66fa0

Please sign in to comment.