git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a66152c 92691d2)
Merge branch 'master' of git://github.com/melinath/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 9 Aug 2010 09:09:35 +0000 (05:09 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 9 Aug 2010 09:09:35 +0000 (05:09 -0400)
* 'master' of git://github.com/melinath/philo:
  Added unique_together constraint to Attributes and Relationships.
  Added a bit to newsletters to streamline interactions with them.

1  2 
contrib/penfield/models.py patch | diff1 | diff2 | blob | history
models/base.py patch | diff1 | diff2 | blob | history

diff --cc contrib/penfield/models.py
Simple merge
diff --cc models/base.py
Simple merge
Foundation for web content management systems using Django.