Private GIT

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

Merge branch 'refs/heads/master' into desktop

Conflicts:
	version.py
parents 96472a9a 7e623429
No related branches found
No related tags found
Loading
Showing
with 244 additions and 82 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment