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
..
array.xml	fix missing things for the colors	2022-09-10 11:35:08 -07:00
attrs.xml	cast + minify (json fix) + ongoing + UI change	2022-02-05 23:21:45 +01:00
colors.xml	fix missing things for the colors	2022-09-10 11:35:08 -07:00
dimens.xml	tv layout stuff	2022-08-06 01:41:35 +02:00
ic_launcher_background.xml	new logo	2021-12-04 01:20:59 +01:00
strings.xml	Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master	2022-09-22 15:18:58 -07:00
styles.xml	fix missing things for the colors	2022-09-10 11:53:37 -07:00