Skip to content

Commit

Permalink
Update CHANGELOG for 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@swalkinshaw
swalkinshaw committed Nov 20, 2014
1 parent 0a7e41a commit cb60fec
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
### 1.3.0: 2014-11-20

* Update to WordPress 4.0.1
* Use johnpbloch/wordpress package instead of custom repository
* Update default deploy.rb
* Require PHP >= 5.4 in composer.json
* Better PSR-1 adherence
* Update phpdotenv dependency to 1.0.9
* Fix Composer installer path plugin order
* Add bedrock-autoloader mu-plugin

### 1.2.7: 2014-09-04

* Update to WordPress 4.0
Expand Down

4 comments on commit cb60fec

@etcook
Copy link
Contributor

@etcook etcook commented on cb60fec Nov 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What method do you guys use to update projects built with a previous version of Bedrock?

@swalkinshaw
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good ol' manual labour. A lot of changes aren't that important to existing projects. I'd just keep a separate repo of Bedrock and copy over files as you need them.

@austinpray
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etcook

I am insane so I usually git remote add upstream [email protected]:roots/bedrock.git and then periodically git pull --rebase and fix the merge conflicts.

@etcook
Copy link
Contributor

@etcook etcook commented on cb60fec Nov 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@austinpray That's actually precisely what I was about to do. With kaleidoscope, merging is fairly simple. Thanks!

Please sign in to comment.