XiangRongLin be8716c0ea Fix compile error caused by auto merging ... #5176 changed `homeDir` from type `String` to `File`. #5059 was based on `homeDir` being a `String`. It was incorrectly auto-resolved by git.		2020-12-15 20:26:38 +01:00
..
assets	Delete GPLv2 license file - not needed	2020-11-15 14:03:20 +00:00
java	Fix compile error caused by auto merging	2020-12-15 20:26:38 +01:00
res	Update NewPipe website URL strings	2020-12-15 19:01:33 +01:00
AndroidManifest.xml	Merge pull request #4859 from TeamNewPipe/update_invidious_URLs	2020-12-12 13:06:37 +01:00