Stefan Schueller 8175956bc0 Merge branch 'develop' into Login ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/net/schueller/peertube/activity/LoginActivity.java # app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java # app/src/main/res/values/strings.xml		2018-12-26 20:19:21 +01:00
..
schueller/peertube	Merge branch 'develop' into Login	2018-12-26 20:19:21 +01:00