mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2026-10-04 06:41:48 +00:00
Merge branch 'dev' into Merge-dev-to-refactor
# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/App.java # app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt # app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt # app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/java/org/schabi/newpipe/player/PlayerService.java # app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
This commit is contained in:
@@ -3,7 +3,7 @@ aboutLibraries = "11.2.3"
|
||||
acraCore = "5.11.3"
|
||||
androidState = "1.4.1"
|
||||
androidx-junit = "1.1.5"
|
||||
appcompat = "1.6.1"
|
||||
appcompat = "1.7.1"
|
||||
assertjCore = "3.24.2"
|
||||
auto-service = "1.1.1"
|
||||
bridge = "2.0.2"
|
||||
|
||||
Reference in New Issue
Block a user