git.ithinksw.org
/
philo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9bbc541
bd4a5d4
)
Merge branch 'master' into flexible_attributes
author
Stephen Burrows
<stephen.r.burrows@gmail.com>
Thu, 14 Oct 2010 13:57:35 +0000
(09:57 -0400)
committer
Stephen Burrows
<stephen.r.burrows@gmail.com>
Thu, 14 Oct 2010 13:57:35 +0000
(09:57 -0400)
1
2
admin/base.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
admin/base.py
Simple merge
git.ithinksw.org / philo.git / commitdiff