Skip to content
Snippets Groups Projects
Commit 1aaee79f authored by Mart van Santen's avatar Mart van Santen
Browse files

Fix conficts

Merge branch '97-give-hydra-a-database-backend' of open.greenhost.net:openappstack/single-sign-on into 97-give-hydra-a-database-backend
parents 51d5a2c6 00bf89be
Branches
Tags
Loading
Pipeline #9567 failed
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment