Skip to content
Snippets Groups Projects
Commit 0fc79a98 authored by Anian Bühler's avatar Anian Bühler
Browse files

Merge branch 'master' into 'dev' 

# Conflicts:
#   README.md
parents a1de1259 35571f51
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 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