Skip to content

Commit

Permalink
Merge pull request roots#248 from austinpray/bump-4.5
Browse files Browse the repository at this point in the history
Bump WordPress to 4.5
  • Loading branch information
retlehs committed Apr 12, 2016
2 parents b4132fa + 5fefff6 commit f31fdab
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 22 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
### HEAD
### 1.6.1: 2016-04-12

* Update to WordPress 4.5
* Update coding standards (PSR-2) ([#244](https://github.com/roots/bedrock/pull/244))

### 1.6.0: 2016-03-03
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.5",
"composer/installers": "~1.0.12",
"vlucas/phpdotenv": "^2.0.1",
"johnpbloch/wordpress": "4.4.2",
"johnpbloch/wordpress": "4.5",
"oscarotero/env": "^1.0",
"roots/wp-password-bcrypt": "1.0.0"
},
Expand Down
42 changes: 22 additions & 20 deletions composer.lock

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

0 comments on commit f31fdab

Please sign in to comment.