Skip to content
Commit 21a88613 authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'lostpassword' 

Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
parents ddd28aae 5fbf378d
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