Stefan Schueller 0e3756f399 Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop ... Conflicts: app/src/main/res/values-fr/strings.xml		2020-07-05 14:17:16 +02:00
..
src	Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop	2020-07-05 14:17:16 +02:00
build.gradle	fix https://github.com/sschueller/peertube-android/issues/202	2020-07-04 22:36:17 +02:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00