]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sun, 26 Jul 2015 20:06:51 +0000 (22:06 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sun, 26 Jul 2015 20:06:51 +0000 (22:06 +0200)
* PHP-5.5:
  make the travis irc notification a oneliner

1  2 
.travis.yml

diff --cc .travis.yml
Simple merge