Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 119 additions and 43 deletions
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