Umberto Furno 8b6104e0fa Merge remote-tracking branch 'origin/feature_integrate_login' into feature_board_view ... # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt # app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java # app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java # app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt # app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt # app/src/main/res/layout/activity_main.xml # app/src/main/res/values/dimens.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # build.gradle		2020-01-10 16:27:30 +01:00
..
BoardDao.kt	fix formatting	2019-12-12 20:23:55 +01:00
WListDao.java	Merge remote-tracking branch 'origin/feature_integrate_login' into feature_board_view	2020-01-10 16:27:30 +01:00