Skip to content

Commit 790096b

Browse files
faizshukrifaizshukri
committed
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts: ext/mysqlnd/mysqlnd_enum_n_def.h
2 parents 1f7f842 + 258c76e commit 790096b

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)