Skip to content
Snippets Groups Projects
Commit 9a060c5c authored by micah's avatar micah :speech_balloon:
Browse files

Merge branch 'master' into debian 

Conflicts:
	AUTHORS
	examples/example.ldap
parents b092a1a1 81921efa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment