git.ithinksw.org / philo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd65e13 a3b1d23)
Merge branch 'gh-pages' of git://github.com/lapilofu/philo into gh-pages
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 2 Jun 2011 21:09:11 +0000 (17:09 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 2 Jun 2011 21:09:11 +0000 (17:09 -0400)
commit07358a0e08bfaa601cd385d0b0854e5b78eea543
tree93b5a800a23881709099fdb971348295f58b5e1ftree | snapshot
parentcd65e13c1e76e6002deede8cbeccfb8bf15dc6f7commit | diff
parenta3b1d23a83cda00d20950b715c291d00c40ae915commit | diff
Merge branch 'gh-pages' of git://github.com/lapilofu/philo into gh-pages

* 'gh-pages' of git://github.com/lapilofu/philo:
  Updated the first container example image so Oberlin is not highlighted as a misspelling and to draw more attention to the container line. (People seemed confused by the large block of code otherwise.)
Foundation for web content management systems using Django.