Skip to content

Commit

Permalink
Merge branch 'trunk' into try/search-qualifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
dd32 authored Jun 10, 2022
2 parents 343293f + 4b76c08 commit c671123
Show file tree
Hide file tree
Showing 69 changed files with 7,170 additions and 722 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ phpcs.xml.dist
# ...except the actual source of this project.
!/source/wp-content/themes
!/source/wp-content/themes/wporg-developer
!/source/wp-content/plugins
!/source/wp-content/plugins/handbook
5 changes: 0 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
{
"type": "vcs",
"url": "[email protected]:WordPress/wporg-mu-plugins.git"
},
{
"type": "vcs",
"url": "[email protected]:WordPress/phpdoc-parser.git"
}
],
"require": {
Expand All @@ -87,7 +83,6 @@
"wordpress-meta/wporg": "1",
"wordpress-meta/pub": "1",
"wordpress-meta/wporg-markdown": "1",
"wordpress/phpdoc-parser": "dev-master",
"wporg/wporg-repo-tools": "dev-trunk",
"wporg/wporg-mu-plugins": "dev-build"
},
Expand Down
Loading

0 comments on commit c671123

Please sign in to comment.