Jocelyn Fiat 21adef6998 Merge branch 'master' into es17.05 ...

# Conflicts:
#	library/network/http_client/http_client-safe.ecf
#	library/network/http_client/libcurl_http_client-safe.ecf
#	library/network/http_client/net_http_client-safe.ecf

2017-06-21 09:01:27 +02:00

..

network

Merge branch 'master' into es17.05

2017-06-21 09:01:27 +02:00

runtime/process/notification_email

Revert changes on notification_email lib.

2017-05-12 14:57:29 +02:00

security

Merge branch 'v1' into es17.05

2017-06-20 09:49:51 +02:00

server

Merge branch 'v1' into es17.05

2017-06-20 09:49:51 +02:00

text

Merge branch 'master' into es17.01

2017-05-17 13:54:01 +02:00

utility/general/error

Merge branch 'master' into es17.05

2017-06-20 18:15:03 +02:00

library.index

Replace Nino by Standalone whenever it is relevant.

2016-10-08 01:02:12 +02:00