Skip to content
Commit 3346dd7a authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch '6-travis-is-broken' into 'master' 

Resolve "Travis is broken"

Closes #6

See merge request !55
parents bfadc756 b6c13935
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