Jocelyn Fiat aeb3392ad8 Merge branch 'master' into es17.05 ...

# Conflicts:
#	contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
#	contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf
#	library/network/http_client/libcurl_http_client-safe.ecf
#	library/network/http_client/net_http_client-safe.ecf

2017-06-20 17:52:40 +02:00

..

SimpleWebServer

Merge branch 'master' into es17.05

2017-06-20 17:52:40 +02:00