Skip to content
Snippets Groups Projects
Commit a9d991d3 authored by feld's avatar feld
Browse files

Merge branch 'develop' into 'akoma/deactivated-users'

# Conflicts:
#   CHANGELOG.md
parents 39b24cdc 0e1356ef
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment