git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 118eb9b 48e24c7)
Merge branch 'master' of http://git.ithinksw.org/philo
authormelinath <stephen.r.burrows@gmail.com>
Fri, 18 Jun 2010 14:43:39 +0000 (10:43 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Fri, 18 Jun 2010 14:43:39 +0000 (10:43 -0400)
1  2 
models.py patch | diff1 | diff2 | blob | history

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