git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: cbbff4f)
Merge branch 'taggit' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 27 Aug 2011 23:04:50 +0000 (16:04 -0700)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 27 Aug 2011 23:04:50 +0000 (16:04 -0700)
Conflicts:
philo/admin/widgets.py
philo/contrib/penfield/admin.py


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