Skip to content
Snippets Groups Projects
Commit 9d480812 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge master into develop 

Conflicts:
	docs/conf.py
	image_creator/version.py
	version
parents 840ccf4b a8943421
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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