merkost 05ced83909 Merge branch 'master' into export_import_settings ... # Conflicts: # app/src/main/res/menu/menu_main.xml		2023-07-20 12:52:42 +10:00
..
src	Merge branch 'master' into export_import_settings	2023-07-20 12:52:42 +10:00
.gitignore	uploading the initial project files	2020-04-03 10:12:58 +02:00
build.gradle	Merge branch 'master' into export_import_settings	2023-07-20 12:52:42 +10:00
proguard-rules.pro	ignore blocked numbers below Android 7	2020-04-19 20:39:37 +02:00