Umberto Furno bb4b4a91c8 Resolved merge conflict		2020-01-08 15:39:33 +01:00
..
androidTest/java/it/unisannio/ding/ids/wedroid/app	Merge branch 'feature_login' into feature_integrate_login	2020-01-07 11:08:42 +01:00
main	Resolved merge conflict	2020-01-08 15:39:33 +01:00
test/java/it/unisannio/ding/ids/wedroid/app	fix formatting	2019-12-12 20:23:55 +01:00