Skip to content

Commit

Permalink
Merge pull request #274 from austinpray/bump-4.6
Browse files Browse the repository at this point in the history
Bump WordPress to 4.6
  • Loading branch information
retlehs authored Aug 16, 2016
2 parents e630980 + 4c00df7 commit 662e149
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 1.7.1: 2016-08-16

* Update to WordPress 4.6

### 1.7.0: 2016-07-10

* Bump PHP requirement to >= 5.6 (5.5 is no longer supported)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"php": ">=5.6",
"composer/installers": "~1.0.12",
"vlucas/phpdotenv": "^2.0.1",
"johnpbloch/wordpress": "4.5.3",
"johnpbloch/wordpress": "4.6",
"oscarotero/env": "^1.0",
"roots/wp-password-bcrypt": "1.0.0"
},
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 662e149

Please sign in to comment.