Merge branch 'master' into 'okSMS_v3.9.4'
# Conflicts: # presentation/src/main/res/values-es/strings.xml
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
# Conflicts: # presentation/src/main/res/values-es/strings.xml