polymorphicshade 985f54c02c SponsorBlock: Merge branch 'dev' into sponsorblock ... # Conflicts: # README.md # app/src/main/res/values/strings.xml		2020-11-28 16:27:28 -07:00
..
androidx/fragment/app	Lint: Make a bunch of stuff final	2020-11-18 17:50:00 -05:00
com/google/android/material/appbar	Skipped interception of buttons in the player in some cases and made image view from playQueue visible	2020-10-01 03:10:42 +03:00
org/schabi/newpipe	SponsorBlock: Merge branch 'dev' into sponsorblock	2020-11-28 16:27:28 -07:00
us/shandian/giga	Fix ktlint errors	2020-11-22 14:03:10 +01:00