Merge remote-tracking branch 'refs/remotes/origin/master' into generic_calc_field

1e1e4217 · Alan Mitchell · 30c5d5e7 · 56040e6a · 1e1e4217 · 1e1e4217
Commit 1e1e4217 authored May 17, 2017 by Alan Mitchell
20 changed files
--- a/docs/source/_static/calc_ex1.png
+++ b/docs/source/_static/calc_ex1.png
--- a/docs/source/_static/calc_ex2.png
+++ b/docs/source/_static/calc_ex2.png
--- a/docs/source/_static/calc_ex3.png
+++ b/docs/source/_static/calc_ex3.png
--- a/docs/source/_static/calc_ex4.png
+++ b/docs/source/_static/calc_ex4.png
--- a/docs/source/_static/calc_ex5.png
+++ b/docs/source/_static/calc_ex5.png
--- a/docs/source/_static/calc_ex6.png
+++ b/docs/source/_static/calc_ex6.png
--- a/docs/source/_static/dashboard_item_blank.png
+++ b/docs/source/_static/dashboard_item_blank.png
--- a/docs/source/_static/delete_association.png
+++ b/docs/source/_static/delete_association.png
--- a/docs/source/_static/delete_sensor.png
+++ b/docs/source/_static/delete_sensor.png
--- a/docs/source/_static/delete_sensors_list.png
+++ b/docs/source/_static/delete_sensors_list.png
--- a/docs/source/_static/ecobee_auth_inputs.png
+++ b/docs/source/_static/ecobee_auth_inputs.png
--- a/docs/source/_static/ecobee_auth_tokens.png
+++ b/docs/source/_static/ecobee_auth_tokens.png
--- a/docs/source/_static/ecobee_pin.png
+++ b/docs/source/_static/ecobee_pin.png
--- a/docs/source/_static/energy_dd.png
+++ b/docs/source/_static/energy_dd.png
--- a/docs/source/_static/energy_dd_inputs.png
+++ b/docs/source/_static/energy_dd_inputs.png
--- a/docs/source/_static/energy_use.png
+++ b/docs/source/_static/energy_use.png
--- a/docs/source/_static/energy_use_inputs.png
+++ b/docs/source/_static/energy_use_inputs.png
--- a/docs/source/_static/get_link.png
+++ b/docs/source/_static/get_link.png
--- a/docs/source/_static/graph_inputs.png
+++ b/docs/source/_static/graph_inputs.png
--- a/docs/source/_static/influxdb_config.png
+++ b/docs/source/_static/influxdb_config.png