Philoul 40e6ebc44a Merge remote-tracking branch 'Nightscout/dev' into Autotune/TWD_TestMerge ... # Conflicts: # app/build.gradle # app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt		2022-06-30 20:27:54 +02:00
..
src	Merge remote-tracking branch 'Nightscout/dev' into Autotune/TWD_TestMerge	2022-06-30 20:27:54 +02:00
.gitignore	automation module	2021-02-22 17:22:30 +01:00
build.gradle	gradle update	2022-06-06 10:25:08 +02:00
consumer-rules.pro	automation module	2021-02-22 17:22:30 +01:00
proguard-rules.pro	automation module	2021-02-22 17:22:30 +01:00