git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac8a325 ee92df2)
Merge branch 'master' of git://github.com/melinath/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Sat, 4 Jun 2011 05:09:48 +0000 (01:09 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Sat, 4 Jun 2011 05:09:48 +0000 (01:09 -0400)
* 'master' of git://github.com/melinath/philo:
  Added a tutorial for Shipherd and made some minor doc improvements.
  Minor correction to BlogView urlpatterns.
  Added SlugTreeEntity to models.base.__all__.
  Added 'unique' check to SlugTreeEntity for cases where the parent is None. Set tagCreation to create a tag if there are none left to move over.


Trivial merge
Foundation for web content management systems using Django.