Commit 9c5dbbde authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Show mail address of the user in the user prefs

See merge request !155
parents f6520eee ff7539a5
Pipeline #1872 passed with stages
in 6 minutes and 42 seconds