Private GIT

Skip to content
Snippets Groups Projects
Commit 61159176 authored by Ruud's avatar Ruud
Browse files

Merge branch 'refs/heads/develop' into desktop 

Conflicts:
	version.py
parents 21df8819 44b78f8d
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)