Stefan Schueller 5ea40a1893 Merge branch 'develop' ... # Conflicts: # .gitlab-ci.yml # Dockerfile # app/build.gradle		2020-08-29 22:34:23 +02:00
..
src	Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop	2020-07-13 13:57:28 +02:00
build.gradle	Automated builds	2020-08-29 22:33:23 +02:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00