Skip to content
Snippets Groups Projects
Commit 2c137974 authored by Kenneth Ezekiel's avatar Kenneth Ezekiel
Browse files

Merge branch 'hotfix' into 'dev' 

fix merge error

See merge request !4
parents f7adbc61 bf240a7b
Branches
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 404 additions and 88 deletions
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