Skip to content

Commit

Permalink
Merge branch 'releases/2.4.0' into develop
Browse files Browse the repository at this point in the history 
2.4.0 readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php
  • Loading branch information
@weierophinney
weierophinney committed Mar 31, 2015
2 parents bdcbd3d + 9827d41 commit f9fd1a9
Show file tree
Hide file tree
Showing 2 changed files with 314 additions and 1 deletion.
Loading

0 comments on commit f9fd1a9

Please sign in to comment.