]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1986d52 03e1e88)
Merge branch 'PHP-7.0'
authorFerenc Kovacs <tyrael@php.net>
Mon, 19 Oct 2015 21:07:58 +0000 (23:07 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 19 Oct 2015 21:07:58 +0000 (23:07 +0200)
commit1eb8e748346733db387a70ed7617f1fcd5e36ef1
treec7c21f40ef51bd03b40563dd30bfe7e375537b12tree | snapshot
parent1986d52cd4dbc1dadc80251b37d97297f0c9ba23commit | diff
parent03e1e88db1a4451ed111b6854805bc801a83c9b8commit | diff
Merge branch 'PHP-7.0'

* PHP-7.0:
  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
Unnamed repository; edit this file 'description' to name the repository.