]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 777831a ff3c693)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 7 Mar 2014 12:26:48 +0000 (05:26 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 7 Mar 2014 12:26:48 +0000 (05:26 -0700)
* PHP-5.6:
  Update php.ini files (new openssl directives)

1  2 
php.ini-development patch | diff1 | diff2 | blob | history
php.ini-production patch | diff1 | diff2 | blob | history

diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
Unnamed repository; edit this file 'description' to name the repository.