KillerDogeEmpire 62d08653de Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/build.gradle		2022-10-27 19:49:27 -07:00
..
array.xml	Merge branch 'recloudstream:master' into master	2022-10-08 17:14:58 -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 'recloudstream:master' into master	2022-10-10 16:45:25 -07:00
styles.xml	Merge remote-tracking branch 'origin/master'	2022-10-27 19:49:27 -07:00