Stefan Schueller eed9702477 Merge branch 'master' into develop ... # Conflicts: # app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java # app/src/main/res/values/strings.xml		2020-06-20 15:12:29 +02:00
..
src	Merge branch 'master' into develop	2020-06-20 15:12:29 +02:00
build.gradle	Release v1.0.37 (#171)	2020-06-19 21:41:11 +02:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00