Christian Schabesberger c43ac7c869 fix conflict

2018-05-27 13:30:23 +02:00

..

appearance_settings.xml

-Added accessibility caption style and text color resolver.

2018-04-08 13:58:55 -07:00

content_settings.xml

-[#1060] Added toggle to disable thumbnail loading.

2018-03-19 16:40:40 -07:00

debug_settings.xml

-Changed Rx exception handling to swallow undeliverable exceptions by default.

2018-02-21 10:42:54 -08:00

download_settings.xml

Update extractor and refactored NewPipe

2017-09-03 13:57:12 -03:00

history_settings.xml

add delete while history

2018-04-29 12:51:57 +02:00

main_settings.xml

made debug setting get a debug symbol

2018-02-21 23:14:14 +01:00

provider_paths.xml

Add root-path /storage (fixes #707)

2017-10-31 12:14:44 +01:00

video_audio_settings.xml

Added the ability to limit video quality if using mobile data.

2018-04-21 12:35:04 -04:00