Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit d0b94df7 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge remote-tracking branch 'origin/master' into synchronize-on-wifi-only 

# Conflicts:
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/preferences.xml
parents 257b3424 b4d260b7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment