Browse files

Merge branch 'master' of github.com:snapframework/snap-website

  • Loading branch information...
2 parents 9917430 + c3271eb commit 93e9e6cb6c7e924017866c7d260d9142bfe9dd07 @mightybyte mightybyte committed Mar 16, 2012
Showing with 4 additions and 8 deletions.
  1. +2 −2 blogdata/content/2012/03/16/snap-0.8-released.md
  2. 0 { → snaplets/heist}/templates/about.tpl
  3. 0 { → snaplets/heist}/templates/benchmarks.tpl
  4. 0 { → snaplets/heist}/templates/docs.tpl
  5. 0 { → snaplets/heist}/templates/docs/api-header.tpl
  6. 0 { → snaplets/heist}/templates/docs/api.tpl
  7. 0 { → snaplets/heist}/templates/docs/quickstart.md
  8. 0 { → snaplets/heist}/templates/docs/quickstart.tpl
  9. 0 { → snaplets/heist}/templates/docs/style-guide.md
  10. 0 { → snaplets/heist}/templates/docs/style-guide.tpl
  11. 0 { → snaplets/heist}/templates/docs/tutorials/heist.md
  12. 0 { → snaplets/heist}/templates/docs/tutorials/heist.tpl
  13. 0 { → snaplets/heist}/templates/docs/tutorials/snap-api-new.md
  14. 0 { → snaplets/heist}/templates/docs/tutorials/snap-api.md
  15. 0 { → snaplets/heist}/templates/docs/tutorials/snap-api.tpl
  16. 0 { → snaplets/heist}/templates/docs/tutorials/snaplets-design.md
  17. 0 { → snaplets/heist}/templates/docs/tutorials/snaplets-design.tpl
  18. 0 { → snaplets/heist}/templates/docs/tutorials/snaplets-tutorial.lhs
  19. 0 { → snaplets/heist}/templates/docs/tutorials/snaplets-tutorial.tpl
  20. 0 { → snaplets/heist}/templates/download.tpl
  21. 0 { → snaplets/heist}/templates/faq.md
  22. 0 { → snaplets/heist}/templates/faq.tpl
  23. 0 { → snaplets/heist}/templates/index.tpl
  24. 0 { → snaplets/heist}/templates/nav.tpl
  25. 0 { → snaplets/heist}/templates/page-head.tpl
  26. 0 { → snaplets/heist}/templates/page.tpl
  27. 0 { → snaplets/heist}/templates/quotes.tpl
  28. 0 { → snaplets/heist}/templates/snaplets.tpl
  29. 0 { → snaplets/heist}/templates/wrap.tpl
  30. +2 −6 src/Main.hs
View
4 blogdata/content/2012/03/16/snap-0.8-released.md
@@ -1,7 +1,7 @@
| title: Announcing: Snap Framework v0.8
| author: Gregory Collins <greg@gregorycollins.net>
-| published: 2012-03-16T20:00:00+0100
-| updated: 2012-03-16T20:00:00+0100
+| published: 2012-03-16T20:55:00+0100
+| updated: 2012-03-16T20:55:00+0100
| summary: Release notes for Snap 0.8
The Snap team would like to announce the release of version 0.8 of the Snap
View
0 templates/about.tpl → snaplets/heist/templates/about.tpl
File renamed without changes.
View
0 templates/benchmarks.tpl → snaplets/heist/templates/benchmarks.tpl
File renamed without changes.
View
0 templates/docs.tpl → snaplets/heist/templates/docs.tpl
File renamed without changes.
View
0 templates/docs/api-header.tpl → snaplets/heist/templates/docs/api-header.tpl
File renamed without changes.
View
0 templates/docs/api.tpl → snaplets/heist/templates/docs/api.tpl
File renamed without changes.
View
0 templates/docs/quickstart.md → snaplets/heist/templates/docs/quickstart.md
File renamed without changes.
View
0 templates/docs/quickstart.tpl → snaplets/heist/templates/docs/quickstart.tpl
File renamed without changes.
View
0 templates/docs/style-guide.md → snaplets/heist/templates/docs/style-guide.md
File renamed without changes.
View
0 templates/docs/style-guide.tpl → ...lets/heist/templates/docs/style-guide.tpl
File renamed without changes.
View
0 templates/docs/tutorials/heist.md → ...s/heist/templates/docs/tutorials/heist.md
File renamed without changes.
View
0 templates/docs/tutorials/heist.tpl → .../heist/templates/docs/tutorials/heist.tpl
File renamed without changes.
View
0 templates/docs/tutorials/snap-api-new.md → .../templates/docs/tutorials/snap-api-new.md
File renamed without changes.
View
0 templates/docs/tutorials/snap-api.md → ...eist/templates/docs/tutorials/snap-api.md
File renamed without changes.
View
0 templates/docs/tutorials/snap-api.tpl → ...ist/templates/docs/tutorials/snap-api.tpl
File renamed without changes.
View
0 templates/docs/tutorials/snaplets-design.md → ...mplates/docs/tutorials/snaplets-design.md
File renamed without changes.
View
0 templates/docs/tutorials/snaplets-design.tpl → ...plates/docs/tutorials/snaplets-design.tpl
File renamed without changes.
View
0 ...ates/docs/tutorials/snaplets-tutorial.lhs → ...ates/docs/tutorials/snaplets-tutorial.lhs
File renamed without changes.
View
0 ...ates/docs/tutorials/snaplets-tutorial.tpl → ...ates/docs/tutorials/snaplets-tutorial.tpl
File renamed without changes.
View
0 templates/download.tpl → snaplets/heist/templates/download.tpl
File renamed without changes.
View
0 templates/faq.md → snaplets/heist/templates/faq.md
File renamed without changes.
View
0 templates/faq.tpl → snaplets/heist/templates/faq.tpl
File renamed without changes.
View
0 templates/index.tpl → snaplets/heist/templates/index.tpl
File renamed without changes.
View
0 templates/nav.tpl → snaplets/heist/templates/nav.tpl
File renamed without changes.
View
0 templates/page-head.tpl → snaplets/heist/templates/page-head.tpl
File renamed without changes.
View
0 templates/page.tpl → snaplets/heist/templates/page.tpl
File renamed without changes.
View
0 templates/quotes.tpl → snaplets/heist/templates/quotes.tpl
File renamed without changes.
View
0 templates/snaplets.tpl → snaplets/heist/templates/snaplets.tpl
File renamed without changes.
View
0 templates/wrap.tpl → snaplets/heist/templates/wrap.tpl
File renamed without changes.
View
8 src/Main.hs
@@ -93,9 +93,5 @@ serverVersion :: SnapletSplice b v
serverVersion = liftHeist $ textSplice $ T.decodeUtf8 snapServerVersion
---main :: IO ()
---main = serveSnaplet defaultConfig appInit
-
-main = quickHttpServe $
- writeBS "The Snap Framework website is currently down for maintenance."
-
+main :: IO ()
+main = serveSnaplet defaultConfig appInit

0 comments on commit 93e9e6c

Please sign in to comment.