Merge pull request #338 from pfaffman/improve-discourse-setup
authorJeff Atwood <jatwood@codinghorror.com>
Mon, 6 Mar 2017 23:19:14 +0000 (15:19 -0800)
committerGitHub <noreply@github.com>
Mon, 6 Mar 2017 23:19:14 +0000 (15:19 -0800)
allow re-run of discourse-setup; pull defaults from standalone.yml


Trivial merge