Merge remote-tracking branch 'upstream/dev' into chore/lint
# Conflicts: # gradle.properties # src/main/kotlin/app/revanced/patches/tumblr/annoyances/popups/fingerprints/ShowGiftMessagePopupFingerprint.kt # src/main/kotlin/app/revanced/patches/tumblr/featureflags/fingerprints/GetFeatureValueFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
This commit is contained in:
commit
4ee26c77b0
20 changed files with 234 additions and 113 deletions
|
|
@ -1,4 +1,4 @@
|
|||
org.gradle.parallel = true
|
||||
org.gradle.caching = true
|
||||
kotlin.code.style = auto # Use Project style setting.
|
||||
version = 4.5.0-dev.1
|
||||
version = 4.6.0-dev.1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue