projects / brevno-suite / hugo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8db3c0b 4a9436c)
Merge branch 'master' of github.com:spf13/hugo
authorspf13 <steve.francia@gmail.com>
Sat, 31 Jan 2015 06:04:28 +0000 (01:04 -0500)
committerspf13 <steve.francia@gmail.com>
Sat, 31 Jan 2015 06:04:28 +0000 (01:04 -0500)
1  2 
hugolib/page.go patch | diff1 | diff2 | blob | history
hugolib/shortcode.go patch | diff1 | diff2 | blob | history

diff --cc hugolib/page.go
Simple merge
diff --cc hugolib/shortcode.go
Simple merge
Unnamed repository; edit this file 'description' to name the repository.