Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix' into current-stable
# Conflicts: # app/src/main/AndroidManifest.xml
- Loading branch information