git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94f9826 cc2232a)
Merge branch 'master' of git://github.com/kgodey/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 5 Jul 2010 18:32:27 +0000 (14:32 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 5 Jul 2010 18:32:27 +0000 (14:32 -0400)
* 'master' of git://github.com/kgodey/philo:
  Fixed null constraint on entries_per_page in BlogView
  Edited unicode methods and added some null=True, blank=True constraints.


Trivial merge
Foundation for web content management systems using Django.