Paulus Schoutsen 1957efefb8 Merge branch 'master' into next ... Conflicts: source/_cookbook/custom_panel_using_react.markdown		2016-08-13 10:29:41 -07:00
..
events.markdown	Add events documentation	2016-03-12 22:39:10 -08:00
platform_options.markdown	Add 0.19 blog post	2016-05-07 12:40:16 -07:00
secrets.markdown	edits (#746)	2016-08-08 14:16:00 +02:00
splitting_configuration.markdown	Update documentation to show unit system (#717)	2016-08-07 17:59:24 -07:00
state_object.markdown	Update state_object.markdown (#725)	2016-08-03 09:14:34 -07:00
templating.markdown	Add details about math, comparision, and logic (#749)	2016-08-08 08:52:35 -07:00