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

Skip to content
Commit f21c7e3b authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch 'master' into 'add-calculator' 

# Conflicts:
#   requirements-dev.txt
#   requirements.txt
parents 4046a5db 69fc9872
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