Skip to content
Snippets Groups Projects
Commit 2b86e474 authored by sveseli's avatar sveseli
Browse files

Merge branch 'master' into 'master'

# Conflicts:
#   doc/RELEASE_NOTES.txt
parents b84b26b7 f7ff1e03
Loading
Showing
with 1091 additions and 11 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment