Fix conflicts in next to master merge

Branch: mergefix/8.0.1

Branch: next

Merged

#39 · Created 2018-11-09 · Last updated 2018-11-12

Merged pull request

Merged in mergefix/8.0.1 (pull request #39)

aff3649·Author: Joseph Parker·Closed by: Peter Hill·2018-11-12

Description

Fix conflicts in next to master merge

0 attachments

0 comments

Loading commits...