git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e81bcde 71d4f57)
Merge branch 'hotfix/embed_widget' of git://github.com/lapilofu/philo into develop develop
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 17 Oct 2012 14:14:58 +0000 (10:14 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 17 Oct 2012 14:14:58 +0000 (10:14 -0400)
* 'hotfix/embed_widget' of git://github.com/lapilofu/philo:
  Fixed a bug which was causing the embed widget to be unusable in Grappelli 2.3.8.


Trivial merge
Foundation for web content management systems using Django.