d4ed18bf08
# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/App.java # app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java # app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentRepliesFragment.java # app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.java # app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java # app/src/main/res/values-bg/strings.xml # app/src/main/res/values-da/strings.xml # app/src/main/res/values-is/strings.xml # app/src/main/res/values-lv/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # build.gradle |
||
---|---|---|
.. | ||
sampledata | ||
schemas/org.schabi.newpipe.database.AppDatabase | ||
src | ||
build.gradle | ||
check-dependencies.gradle | ||
proguard-rules.pro |