git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 7f6fa65)
Merge branch 'attribute_access' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:23:41 +0000 (17:23 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:23:41 +0000 (17:23 -0400)
Conflicts:
philo/models/nodes.py


No differences found
Foundation for web content management systems using Django.