0
0
Fork 0
mirror of https://github.com/YTVanced/Integrations synced 2024-12-03 08:27:26 +00:00
VancedIntegrations/app/src/main
caneleex b630bf8e84 Merge branch 'master' into feature/show-stats
# Conflicts:
#	app/src/main/java/pl/jakubweg/SponsorBlockSettings.java
#	app/src/main/java/pl/jakubweg/SponsorBlockUtils.java
2021-07-23 23:43:59 +02:00
..
java Merge branch 'master' into feature/show-stats 2021-07-23 23:43:59 +02:00
res Merge branch 'master' into feature/show-stats 2021-07-23 23:43:59 +02:00
AndroidManifest.xml Fixes (#34) 2021-06-08 17:25:01 +01:00