Stefan Schueller 8b3f688435 Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop ... Conflicts: app/src/main/res/values-bn/strings.xml app/src/main/res/values-zh-rCN/strings.xml		2020-06-01 20:25:32 +02:00
..
src	Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop	2020-06-01 20:25:32 +02:00
build.gradle	Release v1.0.35	2020-06-01 20:15:07 +02:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00