Merge branch 'master' of git.atlas.oreilly.com:oreillymedia/atlas_book_skeleton

Conflicts:
	atlas.json
pull/192/head
Steve Klise 10 years ago
commit c683ca1328

@ -19,5 +19,5 @@
"toc": true
}
},
"theme": "https://github.com/oreillymedia/atlas_tech1c_theme.git"
}
"theme": "oreillymedia/atlas_tech1c_theme"
}
Loading…
Cancel
Save