Private GIT

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

Merge branch 'refs/heads/develop' into desktop

Conflicts:
	version.py
parents aa1fa3eb b66af0b6
No related branches found
No related tags found
No related merge requests found
Showing
with 198 additions and 204 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment