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

..

request

Merge branch 'master' of https://github.com/Eiffel-World/EiffelWebNino

2013-11-18 17:41:19 +00:00

webroot

Merge branch 'master' of https://github.com/Eiffel-World/EiffelWebNino

2013-11-18 17:41:19 +00:00

application_connection_handler.e

Added "nino" subtree merged in contrib/library/network/server/nino

2012-06-13 22:45:50 +02:00

application.e

Merge branch 'master' of https://github.com/Eiffel-World/EiffelWebNino

2013-11-18 17:41:19 +00:00

http_server_shared_configuration.e

Added "nino" subtree merged in contrib/library/network/server/nino

2012-06-13 22:45:50 +02:00

web_server-safe.ecf

Merge branch 'master' into es17.05

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

web_server.ecf

Update EOL on ecf files.

2017-06-20 17:49:28 +02:00