Merge branch 'master' into 3232-user-guide-updates
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 1 Aug 2014 18:18:35 +0000 (14:18 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 1 Aug 2014 18:18:35 +0000 (14:18 -0400)
commitd6d7788c4e6b1d3da88833329b326fd7a3891503
tree03b26daad92804d42c84e90f58112f6c7c6a7a01
parent62fd09a5e985462de60f7fd4a788a902ea80b8fb
parent42d84bd014b3ab3a1906c9ba68b39835765fe705
Merge branch 'master' into 3232-user-guide-updates
doc/_config.yml
doc/user/getting_started/check-environment.html.textile.liquid