litetex 67651354d5 Fixed conflicts		2022-03-16 15:58:46 +01:00
..
schemas/org.schabi.newpipe.database.AppDatabase	Make uploader_url column nullable	2021-08-14 17:48:35 +08:00
src	Fixed conflicts	2022-03-16 15:58:46 +01:00
build.gradle	Merge branch 'dev' into bumpSomeLibraries	2022-03-15 21:34:41 +01:00
proguard-rules.pro	Show parsed relative times instead of whatever the service gives us	2019-11-17 23:58:55 -03:00