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

Skip to content
Commit d1d9f1ea authored by cketti's avatar cketti
Browse files

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	plugins/openpgp-api-library/build.gradle
parents 825c508f 0ce7c911
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