Stefan Schüller 2123086728 Merge branch 'develop' of ssh://git.techdroid.com:498/sschueller/peertube into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2019-02-17 16:27:47 +01:00
..
src	Merge branch 'develop' of ssh://git.techdroid.com:498/sschueller/peertube into develop	2019-02-17 16:27:47 +01:00
build.gradle	Merge branch 'develop' of ssh://git.techdroid.com:498/sschueller/peertube into develop	2019-02-17 16:27:47 +01:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00