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)
1  2 
doc/_config.yml
doc/user/getting_started/check-environment.html.textile.liquid

diff --cc doc/_config.yml
Simple merge