Merge branch 'ssl' into dev

Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
This commit is contained in:
Xose Pérez
2017-08-27 19:08:20 +02:00
13 changed files with 3113 additions and 3012 deletions

View File

@@ -99,7 +99,7 @@
<a href="#" class="pure-menu-link" data="panel-mqtt">MQTT</a>
</li>
<li class="pure-menu-item">
<li class="pure-menu-item module module-ntp">
<a href="#" class="pure-menu-link" data="panel-ntp">NTP</a>
</li>