Permalink
Browse files

Merge commit 'bmizerany/master'

  • Loading branch information...
2 parents 1037fcb + d2cfe06 commit b73450982a48eb0bff302d413f036ff911379c9e @cypher cypher committed May 19, 2008
Showing with 537 additions and 143 deletions.
  1. +2 −1 .gitignore
  2. +342 −133 lib/sinatra.rb
  3. +1 −1 lib/sinatra/test/unit.rb
  4. +8 −1 test/app_test.rb
  5. +113 −1 test/application_test.rb
  6. +66 −0 test/pipeline_test.rb
  7. +5 −6 test/sessions_test.rb
View
@@ -2,4 +2,5 @@ doc
pkg
*.log
.DS_Store
-Manifest
+Manifest
+x.rb
Oops, something went wrong.

0 comments on commit b734509

Please sign in to comment.