polymorphicshade 615b5e8504 Merge branch 'dev_newpipe' into dev ... # Conflicts: # .github/DISCUSSION_TEMPLATE/questions.yml # .github/workflows/ci.yml # .github/workflows/image-minimizer.yml # .github/workflows/pr-labeler.yml # README.md # app/build.gradle # app/schemas/org.schabi.newpipe.database.AppDatabase/8.json # app/src/main/java/org/schabi/newpipe/MainActivity.java # app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java # app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt # app/src/main/java/org/schabi/newpipe/database/AppDatabase.java # app/src/main/java/org/schabi/newpipe/database/Migrations.java # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java # app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java # app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java # app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java # app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java # app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-az/strings.xml # app/src/main/res/values-b+uz+Latn/strings.xml # app/src/main/res/values-be/strings.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-da/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-el/strings.xml # app/src/main/res/values-eo/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-fi/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-gl/strings.xml # app/src/main/res/values-he/strings.xml # app/src/main/res/values-hr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-in/strings.xml # app/src/main/res/values-is/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-kmr/strings.xml # app/src/main/res/values-ko/strings.xml # app/src/main/res/values-lv/strings.xml # app/src/main/res/values-mk/strings.xml # app/src/main/res/values-nb-rNO/strings.xml # app/src/main/res/values-ne/strings.xml # app/src/main/res/values-nl-rBE/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-pt/strings.xml # app/src/main/res/values-ro/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-ryu/strings.xml # app/src/main/res/values-sc/strings.xml # app/src/main/res/values-sk/strings.xml # app/src/main/res/values-sl/strings.xml # app/src/main/res/values-so/strings.xml # app/src/main/res/values-sq/strings.xml # app/src/main/res/values-sr/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml # app/src/main/res/xml/main_settings.xml # fastlane/metadata/android/bn/changelogs/64.txt # fastlane/metadata/android/de/changelogs/65.txt # fastlane/metadata/android/de/changelogs/940.txt # fastlane/metadata/android/de/changelogs/951.txt # fastlane/metadata/android/de/changelogs/990.txt # fastlane/metadata/android/de/changelogs/995.txt # fastlane/metadata/android/de/full_description.txt # fastlane/metadata/android/de/short_description.txt # fastlane/metadata/android/fr/changelogs/750.txt # fastlane/metadata/android/hr/full_description.txt # fastlane/metadata/android/hu/short_description.txt # fastlane/metadata/android/id/changelogs/66.txt # fastlane/metadata/android/id/changelogs/972.txt # fastlane/metadata/android/id/changelogs/975.txt # fastlane/metadata/android/id/changelogs/976.txt # fastlane/metadata/android/id/changelogs/995.txt # fastlane/metadata/android/ja/changelogs/954.txt # fastlane/metadata/android/ka/changelogs/64.txt # fastlane/metadata/android/ka/changelogs/69.txt # fastlane/metadata/android/ka/changelogs/740.txt # fastlane/metadata/android/ka/changelogs/850.txt # fastlane/metadata/android/ka/changelogs/967.txt # fastlane/metadata/android/ka/changelogs/978.txt # fastlane/metadata/android/ka/changelogs/988.txt # fastlane/metadata/android/ka/full_description.txt # fastlane/metadata/android/pt/changelogs/995.txt # fastlane/metadata/android/ru/changelogs/995.txt # fastlane/metadata/android/sv/changelogs/63.txt # fastlane/metadata/android/sv/changelogs/64.txt # fastlane/metadata/android/sv/short_description.txt # fastlane/metadata/android/tr/full_description.txt # fastlane/metadata/android/vi/changelogs/65.txt # fastlane/metadata/android/vi/changelogs/820.txt # fastlane/metadata/android/zh_Hant_HK/changelogs/995.txt		2024-04-03 19:52:59 -06:00
..
changelogs	Merge branch 'dev_newpipe' into dev	2024-04-03 19:52:59 -06:00