Skip to content

Commit

Permalink
Merge branch 'master' of github.com:barryclark/jekyll-now
Browse files Browse the repository at this point in the history 
Conflicts:
	README.md
  • Loading branch information
@barryclark
barryclark committed May 19, 2014
2 parents 933eef4 + 51380cd commit 74c851c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 74c851c

Please sign in to comment.