Commit 35a3ea41 authored by Georg Teufelberger's avatar Georg Teufelberger
Browse files

Merge branch 'dev' into 'master'

Merge features from dev to master

Closes #1

See merge request !5
parents 18b9c85a 6e8ed4bc
This diff is collapsed.
Supports Markdown
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