git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 819fc76 e96369a)
Merge branch 'develop' into syndication
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 21 Jun 2011 22:38:28 +0000 (18:38 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 21 Jun 2011 22:38:28 +0000 (18:38 -0400)
1  2 
philo/contrib/penfield/models.py patch | diff1 | diff2 | blob | history

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