Skip to content
Snippets Groups Projects
Commit 30c38140 authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merge branch 'master' into DRTVWR-530-maint 

# Conflicts:
#	doc/contributions.txt
parents 764788c9 9957c28d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 963 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