Stefan Schueller 6163011acd Merge branch 'develop' into Login ... # Conflicts: # app/src/main/res/values/strings.xml		2018-12-18 21:21:58 +01:00
..
schueller/peertube	Merge branch 'develop' into Login	2018-12-18 21:21:58 +01:00