Commit Graph

4 Commits

Author SHA1 Message Date
Loren Norman b6ba0fe962 Merge branch 'master' into pln/docs-index
# Conflicts:
#	docs/package.json
#	docs/source/_data/menu.yml
#	docs/themes/cypress/languages/en.yml
2017-05-17 16:36:08 -04:00
Loren Norman 2757cdf5ff stub in some new guides to keep the tests green 2017-05-17 15:49:30 -04:00
Loren Norman 3935721238 move the old docs into a backup folder 2017-05-17 15:44:13 -04:00
Chris Breiding 43f24d950c import docs/ (CYP-907-hexo) 2017-05-15 14:10:01 -04:00