Adam Howard 95d3651e29 Merge branch 'master' of github.com:theScrabi/NewPipe ...

Conflicts:
	app/src/main/AndroidManifest.xml

2015-12-17 17:53:54 +00:00

..

src

Merge branch 'master' of github.com:theScrabi/NewPipe

2015-12-17 17:53:54 +00:00

.gitignore

New version number 0.6.0 and some fixes:

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

build.gradle

mering with master

2015-12-14 13:44:15 +03:00

proguard-rules.pro

first commit

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