Commit 2cafdad1 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'master' into 'development'

# Conflicts:
#   app/Http/Controllers/HumanVerification.php
parents 1651e670 03be6d03
Markdown is supported
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