git.ithinksw.org
/
philo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e50e94
92e8e96
)
Merge branch 'shipherd_hotfix' into release
author
Stephen Burrows
<stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:35 +0000
(15:49 -0400)
committer
Stephen Burrows
<stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:35 +0000
(15:49 -0400)
1
2
philo/contrib/shipherd/templatetags/shipherd.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
philo/contrib/shipherd/templatetags/shipherd.py
Simple merge
git.ithinksw.org / philo.git / commitdiff