Commit 2faeb396 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/corrections'

# Conflicts:
#	extension/Documentation/Manual.rst
parents 60fe7c8b 0848fa61
This diff is collapsed.
Supports Markdown
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