Branch: refs/heads/no-ifconfig Home: https://github.com/yast/yast-dhcp-server Commit: b38c4fad8ec4e5300a06d885de56b989c937481f https://github.com/yast/yast-dhcp-server/commit/b38c4fad8ec4e5300a06d885de56... Author: Martin Vidner Date: 2016-01-26 (Tue, 26 Jan 2016) Changed paths: M package/yast2-dhcp-server.changes M package/yast2-dhcp-server.spec M src/autoyast-rnc/dhcp-server.rnc M src/include/dhcp-server/dialogs.rb M src/include/dhcp-server/widgets.rb M src/modules/DhcpServerUI.rb Log Message: ----------- Merge branch 'master' into no-ifconfig Conflicts: package/yast2-dhcp-server.spec