]> git.pld-linux.org Git - packages/php.git/commitdiff
Merge branch 'dev-7.3'
authorElan Ruusamäe <glen@pld-linux.org>
Wed, 26 Dec 2018 17:21:05 +0000 (19:21 +0200)
committerElan Ruusamäe <glen@pld-linux.org>
Wed, 26 Dec 2018 17:25:21 +0000 (19:25 +0200)
Conflicts:
bug-52078-fileinode.patch
pcre-shared.patch
php-link-libs.patch
php-pear.patch
php.spec
spl-shared.patch

1  2 
php.spec

diff --cc php.spec
Simple merge
This page took 0.156093 seconds and 4 git commands to generate.