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

fdd7e32d

Commit fdd7e32d authored 1 year ago by Koen

Downloads
- Plain Diff

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

parents e57119eb ed29dd83

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt 8 additions, 0 deletions

...n/java/com/futo/platformplayer/activities/MainActivity.kt
app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt 1 addition, 0 deletions

...main/java/com/futo/platformplayer/states/StatePlatform.kt
app/src/main/java/com/futo/platformplayer/states/StatePlayer.kt 14 additions, 0 deletions

...c/main/java/com/futo/platformplayer/states/StatePlayer.kt

with 23 additions and 0 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