Commit Graph

2 Commits

Author SHA1 Message Date
5c4cf195e0 Merge branch 'master' of github.com:KevinMidboe/fanController
Conflicts:
	index.html
	public/index.html
2017-02-19 10:38:05 +01:00
f984cbc1f3 Moved old server file to own folder 2017-01-30 22:55:19 +01:00