Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into rnmobile/update-fro…
Browse files Browse the repository at this point in the history
…m-master
  • Loading branch information
Tug committed Dec 13, 2018
2 parents e72c26b + 6404578 commit 8b58a22
Show file tree
Hide file tree
Showing 81 changed files with 365 additions and 23,458 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const majorMinorRegExp = escapeRegExp( version.replace( /\.\d+$/, '' ) ) + '(\\.
module.exports = {
root: true,
extends: [
'@wordpress/eslint-config',
'plugin:@wordpress/eslint-plugin/recommended',
'plugin:jest/recommended',
],
rules: {
Expand Down
6 changes: 3 additions & 3 deletions docs/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,9 @@
"parent": "packages"
},
{
"title": "@wordpress/eslint-config",
"slug": "packages-eslint-config",
"markdown_source": "https://github.com/WordPress/gutenberg/master/packages/eslint-config/README.md",
"title": "@wordpress/eslint-plugin",
"slug": "packages-eslint-plugin",
"markdown_source": "https://github.com/WordPress/gutenberg/master/packages/eslint-plugin/README.md",
"parent": "packages"
},
{
Expand Down
2 changes: 1 addition & 1 deletion gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Gutenberg
* Plugin URI: https://github.com/WordPress/gutenberg
* Description: Printing since 1440. This is the development plugin for the new block editor in core.
* Version: 4.7.0-rc.1
* Version: 4.7.0
* Author: Gutenberg Team
*
* @package gutenberg
Expand Down
Loading

0 comments on commit 8b58a22

Please sign in to comment.