Merge branch 'gh-pages' of https://github.com/maban/christmas-recipes into gh-pages

Conflicts:
	_includes/foot.html
pull/2/head
Anna Debenham 9 years ago
commit 0b45102d2e
  1. 16
      README.md
  2. 2
      _includes/foot.html
  3. 2
      _site/gingerbread.html
  4. 2
      _site/index.html

@ -1,4 +1,16 @@
christmas-recipes
Christmas Recipes
=================
Nice things to cook around Christmas
[View site, hosted on Github Pages](http://maban.github.io/christmas-recipes/)
This is a demo site, accompanying a tutorial on 24 ways about [getting started with Git Pages and Jekyll](http://24ways.org/2013/get-started-with-github-pages/).
Recipes and images are licensed under a [Creative Commons Attribution/Share-Alike License](http://creativecommons.org/licenses/by-sa/3.0/).
## Usage
Files can be edited on the [Github site](https://github.com/maban/christmas-recipes/), or locally. For full instructions on how to edit files locally using Jekyll, [follow the tutorial on 24 ways](http://24ways.org/2013/get-started-with-github-pages/).
Recipes are formatted in [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
Jekyll generates the raw files into the <i>_sites</i> folder, so do no edit any of the files in here.

@ -13,4 +13,4 @@
</body>
</html>
</html>

@ -161,4 +161,4 @@
</body>
</html>
</html>

@ -109,4 +109,4 @@
</body>
</html>
</html>

Loading…
Cancel
Save