Skip to content
Snippets Groups Projects
Commit 693d9b61 authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

Merge origin/master

Conflicts:
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
parents 6723ec35 6661be8b
No related branches found
No related tags found
No related merge requests found
Showing
with 387 additions and 4 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment