mirror of https://github.com/M66B/FairEmail.git
Merge branch 'master' of bitbucket.org:M66B/fairemail
Conflicts: app/src/main/java/eu/faircode/email/ActivityView.java
This commit is contained in:
commit
c7afdb2d89