59436419 a4043eab83 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	app/src/main/java/org/schabi/newpipe/Themer.java
#	app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
#	app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
#	app/src/main/res/layout-v18/fragment_videoitem_detail.xml
#	app/src/main/res/layout/fragment_videoitem_detail.xml
#	app/src/main/res/xml/settings.xml

2017-01-17 16:18:00 +05:30

..

attrs.xml

Added Dark Theme

2017-01-17 16:13:14 +05:30

colors.xml

Fixes spelling

2016-12-21 20:38:51 +05:30

constants.xml

Added ExoPlayer support

2016-02-15 18:49:58 -08:00

dimens.xml

add channel avatar

2016-08-01 11:48:52 +02:00

settings_keys.xml

Added Dark Theme

2017-01-17 16:13:14 +05:30

strings.xml

Added Dark Theme

2017-01-17 16:13:14 +05:30

styles.xml

Merge remote-tracking branch 'origin/master'

2017-01-17 16:18:00 +05:30