KillerDogeEmpire c49c34ee92 Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master ... # Conflicts: # app/src/main/ic_launcher-playstore.png # app/src/main/res/mipmap-hdpi/ic_launcher.png # app/src/main/res/mipmap-hdpi/ic_launcher_round.png # app/src/main/res/mipmap-mdpi/ic_launcher.png # app/src/main/res/mipmap-mdpi/ic_launcher_round.png # app/src/main/res/mipmap-xhdpi/ic_launcher.png # app/src/main/res/mipmap-xhdpi/ic_launcher_round.png # app/src/main/res/mipmap-xxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png # app/src/prerelease/ic_launcher-playstore.png # app/src/prerelease/res/mipmap-hdpi/ic_launcher.png # app/src/prerelease/res/mipmap-hdpi/ic_launcher_round.png # app/src/prerelease/res/mipmap-mdpi/ic_launcher.png # app/src/prerelease/res/mipmap-mdpi/ic_launcher_round.png # app/src/prerelease/res/mipmap-xhdpi/ic_launcher.png # app/src/prerelease/res/mipmap-xhdpi/ic_launcher_round.png # app/src/prerelease/res/mipmap-xxhdpi/ic_launcher.png # app/src/prerelease/res/mipmap-xxhdpi/ic_launcher_round.png # app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher.png # app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher_round.png		2022-09-22 15:18:58 -07:00
..
androidTest/java/com/lagradost/cloudstream3	small fix to test and m3u8	2022-05-15 20:49:26 +02:00
debug	Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master	2022-09-22 15:18:58 -07:00
main	Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master	2022-09-22 15:18:58 -07:00
prerelease	Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master	2022-09-22 15:18:58 -07:00
release/res	[skip actions] [ImgBot] Optimize images (#116)	2022-09-22 19:24:00 +02:00
test/java/com/lagradost/cloudstream3	fix again	2022-08-06 10:13:21 +02:00