Philoul cd434ed4bb Merge branch 'dev2_Insight_v2' into dev2_insight_dbHelper ... # Conflicts: # insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt # insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java		2021-05-08 20:13:09 +02:00
..
info/nightscout/androidaps	Merge branch 'dev2_Insight_v2' into dev2_insight_dbHelper	2021-05-08 20:13:09 +02:00