summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-16 10:21:21 -0700
committerStanislav Malyshev <stas@php.net>2013-08-16 10:23:31 -0700
commit57887979644f4c9a9de21063f30691404216f372 (patch)
treeb42206dc0ee68720c9acef6a45342ad420594f8e /.gitattributes
parente8a4477a4836b552557a483d803e0b1c29224c2a (diff)
parent060fadca31c61a36823954d030a987a73d04ea02 (diff)
downloadphp-git-57887979644f4c9a9de21063f30691404216f372.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix cve number
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions