Skip to content
Commit 4b21d241 authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Merge remote-tracking branch 'Dieter_be/master' 

Conflicts:
	doc/error_codes.md
parents 2309790b 8ec994a3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment