Merge branch 'bug_fixes_1-6-0' into develop
# Conflicts: # app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
This commit is contained in:
commit
b8f83a7227
# Conflicts: # app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java