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

Skip to content
Commit e16a3e95 authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'main' into 'dev/script-for-session-reset' 

# Conflicts:
#   appinfo/info.xml
#   lib/AppInfo/Application.php
#   lib/Controller/AccountController.php
#   lib/Service/LDAPConnectionService.php
parents 12275ec2 ea48f470
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