Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12188] Add php 5.6 to travis enviroments

Conflicts:
	.travis.yml
This commit is contained in:
Nils Adermann 2014-02-13 15:43:31 +01:00
commit 06581ba927

View file

@ -4,6 +4,7 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6
- hhvm - hhvm
env: env: