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
Branches
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment