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

Skip to content
Commit d789ec68 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge remote-tracking branch 'upstream/2.0' into performance-improvements 



Signed-off-by: default avatarArnau Vàzquez Palma <arnauvp@e.email>

# Conflicts:
#	composer.json
#	index.php
#	src/Helpers/Build.php
parents c99c657c 3dae36a1
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