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
..
construction	Changes in libs to new concept of keywords in libraries. Missing new tests.	2021-05-26 18:17:23 -04:00
schedules	Changes in libs to new concept of keywords in libraries. Missing new tests.	2021-05-26 18:17:23 -04:00
sensors	Merge remote-tracking branch 'origin/master'	2021-06-02 11:25:27 -04:00
usage	before behnam changes in libs	2021-03-23 10:13:01 -04:00
weather	created epw_weather_parameters.py	2021-04-13 15:09:13 -04:00