git.ithinksw.org / philo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0cbc3b7 7f92022)
Merge git://github.com/derega/philo into develop. Merged derega's nav example changes...
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 27 Jun 2011 20:42:53 +0000 (16:42 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 27 Jun 2011 20:42:53 +0000 (16:42 -0400)
commiteeb8a55da97f1b778b78324190f502c4cf7da77c
tree6199e2570fdd16fc24efd38644905ec01423bae4tree | snapshot
parent0cbc3b76a93d6c69e649378a10b75aa57cc7165dcommit | diff
parent7f92022d96df297b0edcc8ca8cfa9b20f2493a3dcommit | diff
Merge git://github.com/derega/philo into develop. Merged derega's nav example changes into templatetag docstring as well.

Conflicts:
docs/tutorials/shipherd.rst
docs/tutorials/shipherd.rst diff1 | diff2 | blob | history
philo/contrib/shipherd/templatetags/shipherd.py diff1 | diff2 | blob | history
Foundation for web content management systems using Django.