Merge branch 'pr/149' - Unicorn PHP Conference

7.0.18RC1 info

Remove the <h1> from the release, since it makes things look weird.

Add PHP Unicorn Conference to conference list

release 7.1.3

Merge branch 'pr/83' - Adds the fix to the conference script disallowing a CfP and Conference announcement to be made at the same time.

fix version

7.0.17 announce

Keep old logos for posterity

Keep original SVG logo send by Colin with change of version inside from CC-SA 3.0 to CC-SA 4.0

fix invalid markup in Conferência PHPRS 2017 news entry

Took the ZendCon CfP Announcement and fixed the merge conflict caused by Eli not merging commits quick enough. (Sorry, didn't realize that some commits were lingering until someone poked me)

Took the changes for Conferência PHPRS 2017, fixed some merge conflicts, and updated the actual content to be HTML instead of raw text so it will render correctly.

Merge branch 'pull-request/147' - Fixes to Madison PHP Conference Entries

Merge branch 'pull-request/146' - Merging teaser-date fix for PHP-UK

Merge branch 'pull-request/145' - Commiting better Cakefest Logo

Added ZendCon 2017 CFP announcement and logo

Merge branch 'master' of https://git.php.net/repository/web/php

tars for php-7.1.3

sync distributions with 7.0.17 taballs

resize image

Add event Conferência PHPRS 2017, From May 12 to 13, 2017, in Porto Alegre / RS-Brazil

Updating Madison PHP Conference announcement to have a separate CfP announcement.

7.0.17RC1 info

Merge branch 'master' of https://git.php.net/repository/web/php