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

Skip to content
Commit 1f431cd8 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/io/eelo/appinstaller/settings/SettingsFragment.kt
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/styles.xml
parents 2d76fa07 f5223f51
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment