Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Showing
with 207 additions and 83 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment