Skip to content
Unverified Commit 77fd1f53 authored by André Peters's avatar André Peters Committed by GitHub
Browse files

Merge pull request #2469 from mhofer117/admin-login 

Fix merge conflicts for admin-login branch
parents 3d8a4635 7d2289c3
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