Merge remote-tracking branch 'megalodon_weblate/main'

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
This commit is contained in:
LucasGGamerM
2023-06-15 14:58:12 -03:00
22 changed files with 335 additions and 62 deletions

View File

@@ -30,6 +30,9 @@
*;
}
# i don't know how proguard works
-keep class org.joinmastodon.android.** { *; }
# Keep all enums for debugging purposes
-keepnames public enum * {
*;
@@ -86,3 +89,6 @@
-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
##---------------End: proguard configuration for Gson ----------
-dontobfuscate