5 commits

Author	SHA1	Message	Date
Paulus Schoutsen	005f777bda	Fix merge conflict	2017-11-02 09:34:32 -07:00
Paulus Schoutsen	2581fb1bcd	Merge branch 'current' into next	2017-11-02 09:31:07 -07:00
Fabian Affolter	ede7ca89ff	Add Sytadin sensor docs (#3819)	2017-10-31 20:19:58 +01:00
Greg. A	fb227fd1d6	Sytadin doc correction (#3842) ... * doc correction * add indice unit	2017-10-30 21:50:24 +01:00
Fabian Affolter	4694d30258	Add Sytadin sensor docs (#3819)	2017-10-29 01:35:10 +02:00