Skip to content

Commit

Permalink
Merge pull request Automattic#100 from roots/wordpress-4.0
Browse files Browse the repository at this point in the history
Update to WordPress 4.0
  • Loading branch information
retlehs committed Sep 4, 2014
2 parents 2da3b63 + a1c7119 commit 0780aea
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 12 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
### 1.2.7: 2014-09-04

* Update to WordPress 4.0

### 1.2.6: 2014-08-06

* Update to WordPress 3.9.2
* Minor deploy fix
* Doc updates

### 1.2.5: 2014-07-16

* Update to WordPress 3.9.1
* Doc updates
* Add `DB_PREFIX` constant
* Update Gem versions
* Disallow indexing in non-production environments

### 1.2.4: 2014-04-17

* Fixes issue with 3.9 update (`composer.lock` wasn't updated)
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"type": "package",
"package": {
"name": "wordpress/wordpress",
"version": "3.9.2",
"version": "4.0",
"type": "webroot",
"dist": {
"type": "zip",
"url": "https://wordpress.org/wordpress-3.9.2.zip"
"url": "https://wordpress.org/wordpress-4.0.zip"
},
"require" : {
"fancyguy/webroot-installer": "1.1.0"
Expand All @@ -56,7 +56,7 @@
],
"require": {
"php": ">=5.3.2",
"wordpress/wordpress": "3.9.2",
"wordpress/wordpress": "4.0",
"fancyguy/webroot-installer": "1.1.0",
"composer/installers": "v1.0.12",
"vlucas/phpdotenv": "~1.0.6"
Expand Down
25 changes: 16 additions & 9 deletions composer.lock

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

0 comments on commit 0780aea

Please sign in to comment.