Isira Seneviratne 21d2ae709f Merge branch 'dev' into Use_AppCompatResources ... # Conflicts: # app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java		2022-05-16 12:36:00 +05:30
..
schemas/org.schabi.newpipe.database.AppDatabase	Migrate NotificationIcon to Picasso	2021-09-07 13:30:26 +03:00
src	Merge branch 'dev' into Use_AppCompatResources	2022-05-16 12:36:00 +05:30
build.gradle	Merge branch 'master' into dev	2022-04-29 16:41:18 +02:00
proguard-rules.pro	Fix proguard rules to keep Notifications settings fragment	2022-04-16 21:26:25 +02:00