Skip to content
Commit 08a11d6e authored by Ross Gammon's avatar Ross Gammon
Browse files

Merge remote-tracking branch 'gramps/maintenance/gramps41' into up-gramps41 

Conflicts:
	gramps/plugins/docgen/cairodoc.py
parents a7f21760 4141b7e3
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