added CfP IPC 2016

[rmunsky]

Pls add this new entry. i started forking the repo again, was faster.

[Stelian]

Please resolve the conflicts so I can merge this.

[rmunsky]

what merge conflicts? i did setup a fresh clone of the repo and comitted my changes. pls give me some more details. did you change same file meanwhile since my pr was set 11 days ago?

[Stelian]

the archive.xml has a conflict, so I am guessing another news item has been added in the meantime, apologies for this.

To reproduce:

git fetch git://github.com/php/web-php pull/85/head:pull-request/85
git merge pull-request/85
make test

[rmunsky]

pls have a look now

[cbrueckner]

pls have a look. i added the International PHP Conference Spring 2016 to show this in Upcoming Conferences. Is this fine?

[php-pulls]

Comment on behalf of johannes at php.net:

merged