Merge branch 'develop' into 1.9

Browse Source

# Conflicts:
#	CHANGELOG.md
#	blueprints.yaml

...

This commit is contained in:

Andy Miller

2019-01-25 14:03:43 -07:00

parent 8a640fc5a8 2b4fdb40fa

commit 5400c06d3f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available