Permalink
Browse files

Merge branch 'polish-namespace-specs' of github.com:kytrinyx/sinatra-…

…contrib

Conflicts:
	spec/namespace_spec.rb
  • Loading branch information...
2 parents 65ffe0b + 9b12115 commit edf67ace7f313612edf4576dfac00fe6fc7d9b8a @TrevorBramble TrevorBramble committed Feb 19, 2013
Showing with 291 additions and 280 deletions.
  1. +291 −280 spec/namespace_spec.rb
Oops, something went wrong.

0 comments on commit edf67ac

Please sign in to comment.