Pilar 22d00933c6 Merge remote-tracking branch 'origin/master' ... # Conflicts: # data/sensors/concordia_energy_db.json # imports/sensors/concordia_energy_consumption.py		2021-06-02 11:25:27 -04:00
..
concordia_energy_db.json	Merge remote-tracking branch 'origin/master'	2021-06-02 11:25:27 -04:00
concordia_gas_flow_db.json	changes to add new sensors of other types	2021-06-02 11:24:58 -04:00
concordia_temperature_db.json	changes to add new sensors of other types	2021-06-02 11:24:58 -04:00