Mauricio Colli fc7c2c9f5a Merge remote-tracking branch 'weblate/master' into fix-strings ... # Conflicts: # app/src/main/res/values-b+ast/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-pl/strings.xml # app/src/main/res/values-pt-rBR/strings.xml		2017-06-04 20:57:00 -03:00
..
androidTest/java/org/schabi/newpipe	convert android tests to junit tests	2017-02-16 00:17:43 +01:00
main	Merge remote-tracking branch 'weblate/master' into fix-strings	2017-06-04 20:57:00 -03:00
test/java	Add resolution support up to 4k and 60 fps	2017-04-12 03:07:15 -03:00