Merge branch 'bug_fixes_1-6-0' into develop

# Conflicts:
#	app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
This commit is contained in:
Thomas 2020-11-14 15:21:58 +01:00
commit b8f83a7227

Diff Content Not Available