Merge branch 'dev' into thingspeak

Conflicts:
	code/espurna/data/index.html.gz
	code/espurna/static/index.html.gz.h
This commit is contained in:
Xose Pérez
2018-01-07 16:02:57 +01:00
62 changed files with 2613 additions and 2606 deletions

View File

@@ -137,7 +137,7 @@
</div>
<div class="footer">
&copy; 2016-2017<br />
&copy; 2016-2018<br />
Xose Pérez<br/>
<a href="http://tinkerman.cat" target="_blank">http://tinkerman.cat</a><br/>
<a href="https://bitbucket.org/xoseperez/espurna" target="_blank">ESPurna @ Bitbucket</a><br/>