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	core module	2020-05-03 21:27:42 +02:00
android_dependencies.gradle	relocate gradle files	2022-05-11 10:18:14 +02:00
android_module_dependencies.gradle	relocate gradle files	2022-05-11 10:18:14 +02:00
build.gradle	gradle update	2022-06-06 10:25:08 +02:00
consumer-rules.pro	core module	2020-05-03 21:27:42 +02:00
core_dependencies.gradle	Revert "GraphView -> 4.2.2"	2022-05-26 13:58:12 +02:00
jacoco_global.gradle	relocate gradle files	2022-05-11 10:18:14 +02:00
proguard-rules.pro	core module	2020-05-03 21:27:42 +02:00
test_dependencies.gradle	cleanup & turn on looging in tests	2022-06-28 20:56:43 +02:00