mihon/app
arkon 2f94f62a56 Merge branch 'fix-12' into master
# Conflicts:
#	.github/ISSUE_TEMPLATE.md
#	.github/ISSUE_TEMPLATE/report_issue.yml
#	.github/ISSUE_TEMPLATE/request_feature.yml
2021-08-06 17:33:24 -04:00
..
src Merge branch 'fix-12' into master 2021-08-06 17:33:24 -04:00
.gitignore
build.gradle.kts Merge branch 'fix-12' into master 2021-08-06 17:33:24 -04:00
proguard-android-optimize.txt
proguard-rules.pro
shortcuts.xml