git.maquefel.me Git - brevno-suite/hugo/commit

projects / brevno-suite / hugo / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 627cf26 580bb9b)

author	spf13 <steve.francia@gmail.com>
	Wed, 24 Jul 2013 15:27:03 +0000 (11:27 -0400)
committer	spf13 <steve.francia@gmail.com>
	Wed, 24 Jul 2013 15:27:03 +0000 (11:27 -0400)
commit	3ad3f2f0e020e28a899af43146bf5df1a4c36bc6
tree	57625d2f5ebabd6f89d288791e6ee556f5d57fa4	tree \| snapshot
parent	627cf26571cbbe7a1a02439a3d7b7b4dce8ad066	commit \| diff
parent	580bb9bb5be87e6132065787f6f1ee704d183c5b	commit \| diff

Merge branch 'doc-fix' of https://github.com/brandonblack/hugo into brandonblack-doc-fix

Conflicts:
README.md

Unnamed repository; edit this file 'description' to name the repository.