1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 10:01:55 +02:00

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

View File

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