git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b94a8f7 3b81e33)
Remerged clone to push to it
authormelinath <stephen.r.burrows@gmail.com>
Wed, 16 Jun 2010 18:56:16 +0000 (14:56 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Wed, 16 Jun 2010 18:56:16 +0000 (14:56 -0400)
1  2 
admin.py patch | diff1 | diff2 | blob | history

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