Christian Schabesberger c8d94f541f resolved merge conflict		2016-01-05 21:50:25 +01:00
..
java/org/schabi/newpipe	resolved merge conflict	2016-01-05 21:50:25 +01:00
res	resolved merge conflict	2016-01-05 21:50:25 +01:00
AndroidManifest.xml	update resources names to match naming convention & cleanup & start working on themes	2016-01-05 22:56:40 +03:00