git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee56a2c 6316885)
Merge branch 'master' into navigation
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 21 Dec 2010 15:12:03 +0000 (10:12 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 21 Dec 2010 15:12:03 +0000 (10:12 -0500)
1  2 
models/nodes.py patch | diff1 | diff2 | blob | history
templatetags/nodes.py patch | diff1 | diff2 | blob | history

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