Merge remote-tracking branch 'origin/3.6' into 4.0 · silverstripe/silverstripe-installer@743f9c6 · GitHub

Commit

Merge remote-tracking branch 'origin/3.6' into 4.0

Browse files

  # Conflicts:
  #	.cow.json
  #	.gitignore
  #	composer.json

Loading branch information

robbieaverill committed May 28, 2018

2 parents cd6a22c + 45b3cb6 commit 743f9c6