Secozzi 341c53af96 Merge remote-tracking branch 'origin/master' into mihonmerge ... # Conflicts: # i18n/src/commonMain/moko-resources/ar/strings.xml # i18n/src/commonMain/moko-resources/as/strings.xml # i18n/src/commonMain/moko-resources/it/strings.xml # i18n/src/commonMain/moko-resources/ja/strings.xml # i18n/src/commonMain/moko-resources/pl/strings.xml # i18n/src/commonMain/moko-resources/vi/strings.xml # i18n/src/commonMain/moko-resources/zh-rCN/strings.xml		2024-10-30 11:44:29 +01:00
..
src/main	Merge remote-tracking branch 'origin/master' into mihonmerge	2024-10-30 11:44:29 +01:00
.gitignore	merge5	2023-05-21 14:52:06 +02:00
build.gradle.kts	Migrate some classpaths to gradle plugins	2024-10-29 23:07:16 +01:00
consumer-rules.pro	merge5	2023-05-21 14:52:06 +02:00
proguard-rules.pro	merge5	2023-05-21 14:52:06 +02:00