1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-11-23 00:28:14 +00:00

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

Conflicts:
	atlas.json
This commit is contained in:
Steve Klise 2014-06-19 16:06:10 -07:00
commit c683ca1328

View File

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