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	new tv icon	2022-04-22 18:52:31 +02:00
drawable-anydpi-v24	updated logo	2021-12-04 22:40:55 +01:00
drawable-hdpi	fixed image location	2022-01-07 20:38:38 +01:00
drawable-mdpi	updated logo	2021-12-04 22:40:55 +01:00
drawable-v24	new tv icon	2022-04-22 18:52:31 +02:00
drawable-xhdpi	updated logo	2021-12-04 22:40:55 +01:00
drawable-xxhdpi	updated logo	2021-12-04 22:40:55 +01:00
mipmap-anydpi-v26	Added Themed Icon for Android 13 (#1341)	2022-07-25 23:38:46 +00: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	[skip actions] [ImgBot] Optimize images (#116)	2022-09-22 19:24:00 +02: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 fixes, fix auto build, new beta logo	2022-09-06 17:06:48 -07:00