NewPipe/fastlane
polymorphicshade d4d37af486 Merge branch 'master' into sponsorblock
# Conflicts:
#	README.md
#	app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
#	app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
#	app/src/main/java/org/schabi/newpipe/player/Player.java
#	app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/strings.xml
#	doc/README.es.md
#	doc/README.ja.md
#	doc/README.ko.md
#	doc/README.pt_BR.md
#	doc/README.ro.md
#	doc/README.so.md
#	doc/README.tr.md
2022-07-09 10:26:42 -06:00
..
metadata/android Merge branch 'master' into sponsorblock 2022-07-09 10:26:42 -06:00