Skip to content
Snippets Groups Projects
Commit 7aa9f040 authored by Henrik Tjäder's avatar Henrik Tjäder
Browse files

Merge branch 'master' into 'master' 

# Conflicts:
#   README.md
parents 4a5c9c7a 77a2d150
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 10 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment