NewPipe/app
polymorphicshade e9c12f37bb Merge branch 'master' into sponsorblock
# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
#	app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java
#	app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
#	app/src/main/res/values-so/strings.xml
#	app/src/main/res/values/strings.xml
2021-03-27 18:05:58 -06:00
..
schemas/org.schabi.newpipe.database.AppDatabase Implement feed groups manual sorting 2020-03-14 00:12:45 -03:00
src Merge branch 'master' into sponsorblock 2021-03-27 18:05:58 -06:00
.gitignore Update app/.gitignore 2020-02-19 17:40:03 +01:00
build.gradle Merge branch 'master' into sponsorblock 2021-03-27 18:05:58 -06:00
proguard-rules.pro Show parsed relative times instead of whatever the service gives us 2019-11-17 23:58:55 -03:00