Jacob Salvi 0151467b2e Merge branch 'dev' into '75-backend-unit-testing' ... # Conflicts: # src/test/java/ch/usi/inf/sa4/sanmarinoes/smarthut/UserResponseTests.java		2020-05-17 15:28:14 +02:00
..
inf/sa4/sanmarinoes/smarthut	Merge branch 'dev' into '75-backend-unit-testing'	2020-05-17 15:28:14 +02:00