5 commits

Author	SHA1	Message	Date
Paulus Schoutsen	e7d7175aa1	Merge branch 'master' into next ... Conflicts: source/_components/sensor.loop_energy.markdown	2016-04-19 22:56:48 -07:00
pavoni	fa2f2b6941	Add new parameters to docs.	2016-04-18 12:34:02 +01:00
Greg Dowling	04581ecde4	Add info about how to get the required keys (#379)	2016-04-09 11:56:46 +02:00
Fabian Affolter	b3180e0879	Add loop energy docs	2016-04-08 23:05:58 -07:00
Fabian Affolter	6b44dc4263	Add loop energy docs	2016-04-02 23:32:04 +02:00