Stefan Schueller b240fa260e Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop ... Conflicts: fastlane/metadata/android/fr-FR/full_description.txt fastlane/metadata/android/fr-FR/title.txt		2020-11-22 13:47:28 +01:00
..
android	Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop	2020-11-22 13:47:28 +01:00