Skip to content
Snippets Groups Projects
Commit 64f29bd2 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/master

Conflicts:
	others/db_changes/masterChangelog.xml
parents 45c1bd00 0c6e6729
No related branches found
No related tags found
No related merge requests found
Showing
with 582 additions and 2 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