projects
/
blog
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b0358a4
f3c3ef4
)
Merge branch 'master' into sass
author
Mark Otto
<markdotto@gmail.com>
Sun, 19 Apr 2015 06:01:09 +0000
(23:01 -0700)
committer
Mark Otto
<markdotto@gmail.com>
Sun, 19 Apr 2015 06:01:09 +0000
(23:01 -0700)
1
2
_layouts/post.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
_layouts/post.html
Simple merge