git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85eb51c 21abe38)
Merge branch 'release' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 1 Jun 2011 21:50:47 +0000 (17:50 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 1 Jun 2011 21:50:47 +0000 (17:50 -0400)
1  2 
philo/models/nodes.py patch | diff1 | diff2 | blob | history

diff --cc philo/models/nodes.py
Simple merge
Foundation for web content management systems using Django.