polymorphicshade 695970e069 Merge branch 'master' into sponsorblock ... # Conflicts: # app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/layout/player.xml # app/src/main/res/values-so/strings.xml		2021-08-23 22:01:53 -06:00
..
changelogs	v0.21.9 (975) changelog	2021-08-04 11:51:29 +02:00
images	Update shot_10.png to include Bandcamp in the list of services (#6140)	2021-04-23 09:39:08 +00:00
full_description.txt	adjust descriptions (en+de) to match the fork	2021-06-28 21:15:14 +02:00
short_description.txt	adjust descriptions (en+de) to match the fork	2021-06-28 21:15:14 +02:00