Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'version/bump' into develop
Browse files Browse the repository at this point in the history
Bump to next dev version
  • Loading branch information
weierophinney committed Jun 4, 2015
2 parents 07d4bc9 + 454bc1f commit 0116d10
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions README.md
@@ -1,22 +1,16 @@
![Logo](https://raw.githubusercontent.com/zendframework/zf2/234b554f2ca202095aea32e4fa557553f8849664/resources/ZendFramework-logo.png)

# Welcome to the *Zend Framework 2.5* Release!
# Welcome to the *Zend Framework 2.6* Release!

## RELEASE INFORMATION

*Zend Framework 2.5.1*
*Zend Framework 2.6.0dev*

This is the first maintenance release for the version 2.5 series.
This is the sixth minor (feature) release for the version 2 series.

04 June 2015
DD MMM YYYY

### UPDATES IN 2.5.1

- [#7571](https://github.com/zendframework/zf2/pull/7571) makes `zend-ldap` an
optional dependency instead of a hard dependency, as `zend-ldap` has a hard
requirement on `ext-ldap`, blocking installation for many users. If you use
`zend-ldap`, you will need to call `composer require zendframework/zend-ldap`
after upgrading to 2.5.1.
### UPDATES IN 2.6.0

Please see [CHANGELOG.md](CHANGELOG.md).

Expand Down

0 comments on commit 0116d10

Please sign in to comment.