Skip to content
Commit e43e8b0d authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into rename-lostpassword-controller 

Conflicts:
	core/lostpassword/controller.php
parents 5539b9e8 09187f3b
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