]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorLior Kaplan <kaplanlior@gmail.com>
Tue, 15 Dec 2015 11:26:53 +0000 (13:26 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Tue, 15 Dec 2015 11:26:53 +0000 (13:26 +0200)
commit10a5749f3eac0c999fc3a199fe7c96c151adc358
treeb960337dad653bd8d97df359dfcd7de67447fd38
parent29a2c6433985a6bdeb62f25895de815c8f0f914e
parent94f3887152dd749b63fca3e3509991bc6a50b813
Merge branch 'PHP-7.0'

* PHP-7.0:
  Implement FR #55651 (Option to ignore the returned FTP PASV address)