]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 26e5429 395ef4e)
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyrael@php.net>
Mon, 19 Oct 2015 21:02:52 +0000 (23:02 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 19 Oct 2015 21:02:52 +0000 (23:02 +0200)
commit03e1e88db1a4451ed111b6854805bc801a83c9b8
tree67c7d8b0e1f964c1135d25b281145ef71193219etree | snapshot
parent26e5429f721b40d6d721fa9e2e2ede5f6222798ccommit | diff
parent395ef4efb72aab6a660612be4632794f00991d85commit | diff
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
.travis.yml diff1 | diff2 | blob | history
travis/compile.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.