Jared Fantaye 5d3955854e Fixed the merge conflict		2023-02-05 21:21:02 +01:00
..
assets	Update displayed licenses	2020-12-31 19:26:41 -05:00
java	Fixed the merge conflict	2023-02-05 21:21:02 +01:00
res	Merge pull request #9538 from Jared234/4186_warning_duplicates_in_playlist	2023-01-29 10:36:31 +01:00
AndroidManifest.xml	Merge pull request #9306 from Stypox/target-api-33	2022-12-31 14:49:30 +01:00