diff options
author | Anatol Belski <ab@php.net> | 2014-12-10 13:22:52 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-10 13:22:52 +0100 |
commit | 21da246807274df4ab04ca666a1069f4e1539a3b (patch) | |
tree | ee3ecc6c723821971b231aeeabcc5d8ac258b50f | |
parent | a96957f0da8e733a13f20327c12f876e8966aff1 (diff) | |
parent | c5f7dcd1dc306466de938fc9b9e76dda2a300196 (diff) | |
download | php-git-21da246807274df4ab04ca666a1069f4e1539a3b.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move the test to the right place
-rw-r--r-- | ext/standard/tests/serialize/bug68545.phpt (renamed from standard/tests/serialize/bug68545.phpt) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt index e7250b37bc..e7250b37bc 100644 --- a/standard/tests/serialize/bug68545.phpt +++ b/ext/standard/tests/serialize/bug68545.phpt |