]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Thu, 21 Jul 2016 06:25:36 +0000 (14:25 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 21 Jul 2016 06:25:36 +0000 (14:25 +0800)
* PHP-7.0:
  Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)

1  2 
ext/intl/calendar/calendar_class.cpp

Simple merge