Michael Balzer 0137aef471 Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3 ... # Conflicts: # components/bt/include/esp_bt.h		2020-07-15 12:08:17 +02:00
..
dhcpserver	LWIP DHCP server: fix disabling DNS offer	2019-12-17 21:16:36 +01:00
ping	add ping length and QoS	2018-10-17 09:39:27 +00:00
sntp	sntp/lwip: Add some modes for time synchronization	2019-10-14 07:09:28 +00:00