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
..
drawable	bug fix	2022-09-06 17:11:44 -07:00
drawable-v24	Bug fixes, fix auto build, new beta logo	2022-09-06 17:06:48 -07:00
mipmap-anydpi-v26	Bug fixes, fix auto build, new beta logo	2022-09-06 17:06:48 -07:00
mipmap-hdpi	[skip actions] [ImgBot] Optimize images (#116)	2022-09-22 19:24:00 +02:00
mipmap-mdpi	[skip actions] [ImgBot] Optimize images (#116)	2022-09-22 19:24:00 +02:00
mipmap-xhdpi	Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master	2022-09-22 15:18:58 -07:00
mipmap-xxhdpi	[skip actions] [ImgBot] Optimize images (#116)	2022-09-22 19:24:00 +02:00
mipmap-xxxhdpi	[skip actions] [ImgBot] Optimize images (#116)	2022-09-22 19:24:00 +02:00
values	bug fix	2022-09-06 17:11:44 -07:00