git.ithinksw.org
/
philo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bcaf02b
60e2eb9
)
Merge branch 'master' of git://github.com/melinath/philo
author
Joseph Spiros
<joseph.spiros@ithinksw.com>
Wed, 21 Jul 2010 16:55:17 +0000
(12:55 -0400)
committer
Joseph Spiros
<joseph.spiros@ithinksw.com>
Wed, 21 Jul 2010 16:55:17 +0000
(12:55 -0400)
* 'master' of git://github.com/melinath/philo:
Membersof now uses 'app_label.model'; removed blockcontainer
Slight changes to penfield NewsletterIssueAdmin & added newsletter value models
Trivial merge