Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grayjay
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

dbea93ef

Commit dbea93ef authored 1 year ago by Koen

Downloads
- Plain Diff

Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

parents 3bf0740b fa7f1b11

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/platformplayer/Settings.kt 6 additions, 0 deletions

app/src/main/java/com/futo/platformplayer/Settings.kt
app/src/main/java/com/futo/platformplayer/cache/ChannelContentCache.kt 1 addition, 1 deletion

...java/com/futo/platformplayer/cache/ChannelContentCache.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt 14 additions, 3 deletions

...r/fragment/mainactivity/main/SubscriptionsFeedFragment.kt
app/src/main/res/values/strings.xml 4 additions, 0 deletions

app/src/main/res/values/strings.xml

with 25 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment