Skip to content
Snippets Groups Projects
Commit f510b1b3 authored by René Schöne's avatar René Schöne
Browse files

Merge branch 'dev' into 'master' 

Updating master with current development state.

Closes #20, #14, #18, and #15

See merge request !4
parents a465e8c8 310ab641
No related branches found
No related tags found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 71 additions and 46 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment