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

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

Merge branch 'main' into 'calendar-acceptdeclinemaybe-mail' 

# Conflicts:
#   l10n/de.js
#   l10n/de.json
#   l10n/de_DE.js
#   l10n/de_DE.json
#   l10n/es.js
#   l10n/es.json
#   l10n/fr.js
#   l10n/fr.json
parents d243bac8 d04f8159
Expand all 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