]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'bugfix/tw16581_dhcps_default_behaviour_changed' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Fri, 1 Dec 2017 11:21:26 +0000 (19:21 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Fri, 1 Dec 2017 11:21:26 +0000 (19:21 +0800)
fix the dhcps default behaviour chenged by dns

See merge request !1612

1  2 
components/lwip/apps/dhcpserver.c

Simple merge