]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorPeter Kokot <peterkokot@gmail.com>
Sat, 18 May 2019 19:42:45 +0000 (21:42 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Sat, 18 May 2019 19:42:45 +0000 (21:42 +0200)
* PHP-7.4:
  [ci skip] Migrate Coding standards docs to Markdown
  Move CODING_STANDARDS to CODING_STANDARDS.md

1  2 
CONTRIBUTING.md
main/main.c

diff --cc CONTRIBUTING.md
Simple merge
diff --cc main/main.c
Simple merge