Skip to content
Snippets Groups Projects
Commit 96b2dc29 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'stable' 

Conflicts:
	doc/user/tutorial.xml
	doc/www-data.in/download.cmake
parents f0fd09cc 5314df10
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions 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