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

Merge branch 'master' into csrf-on-login-and-logout 

Conflicts:
	core/templates/login.php
parents e1e1009c b6d2d632
Expand all 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