Matteo Omenetti 3070113ba2 Merge branch 'dev' into 'controllers-feature' ... # Conflicts: # .idea/misc.xml # git-hooks/pre-commit.sh		2020-02-26 14:51:47 +01:00
..
main	Merge branch 'dev' into 'controllers-feature'	2020-02-26 14:51:47 +01:00
test/java/ch/usi/inf/sa4/sanmarinoes/smarthut	Formatted code according to google java (aosp) format	2020-02-24 14:15:49 +01:00