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

..

src

Merge remote-tracking branch 'origin/master'

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

.gitignore

New version number 0.6.0 and some fixes:

2015-11-10 20:51:39 +01:00

build.gradle

Added Dark Theme

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

proguard-rules.pro

first commit

2015-09-04 02:15:03 +02:00