merge with upstream master

2017-12-19 15:18:35 +01:00
parent efb4547a37
commit 197db1003b
85 changed files with 2522 additions and 697 deletions
--- a/helix/user_values.py
+++ b/helix/user_values.py
@@ -8,7 +8,7 @@ from helix.constants.panel_type import PanelType
 from helix.constants.system_type import SystemType
 from helix.models.coordinate import Coordinate
 from helix.models.panel import PanelData, Panel
-from helix.models.sql.inverter_brands import InverterBrand
+

 class UserValues(object):
    def __init__(self, store, site):