cloudstream/app
Martin Filo 0fb2e68118 Merge branch 'master' into feature/remote-sync
# Conflicts:
#	app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
#	app/src/main/res/values/strings.xml
2023-06-22 20:30:41 +02:00
..
src Merge branch 'master' into feature/remote-sync 2023-06-22 20:30:41 +02:00
.gitignore init 2021-04-30 19:20:15 +02:00
build.gradle.kts Merge branch 'master' into feature/remote-sync 2023-06-22 20:30:41 +02:00
proguard-rules.pro Switch to kotlin build scripts (#158) 2022-10-26 21:56:31 +02:00