Conflicts: app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java -- still used class-based passing app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java -- just some whitespace |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| app.iml | ||
| build.gradle | ||
| proguard-rules.pro | ||