Merge branch 'develop' of framagit.org:tom79/fedilab into develop
Conflicts: app/src/main/java/app/fedilab/android/helper/Helper.java
This diff is collapsed.
Please register or sign in to comment
Conflicts: app/src/main/java/app/fedilab/android/helper/Helper.java