Skip to content
Commit 0120f3fd authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'routing' 

Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
parents 74665fae beaaf542
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