Claudio Maggioni 5ae97da8a7 Merge branch 'dev' into 'device-unification' ... # Conflicts: # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/SpringFoxConfig.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/DimmableLightController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/MotionSensorController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RegularLightController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SensorController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SmartPlugController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java # src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java		2020-03-02 21:48:02 +01:00
..
ch/usi/inf/sa4/sanmarinoes/smarthut	Merge branch 'dev' into 'device-unification'	2020-03-02 21:48:02 +01:00