Skip to content
Snippets Groups Projects
Commit 5c73ae04 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Merge branch 'lmd5' into bcrypt 

Conflicts:
	lib/plugins/config/settings/config.metadata.php
parents 560f6ea3 c8ca60df
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