Skip to content
Snippets Groups Projects
Verified Commit e1186033 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	aleksis/apps/ldap/util/ldap_sync.py
parents 4a3c3dbd 647bbd8c
No related branches found
No related tags found
No related merge requests found
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