mirror of
				https://github.com/KevinMidboe/fanController.git
				synced 2025-10-29 17:40:22 +00:00 
			
		
		
		
	Merge branch 'master' of github.com:KevinMidboe/fanController
Conflicts: index.html public/index.html
This commit is contained in:
		Conflicts: index.html public/index.html