Skip to content

Commit

Permalink
Merge branch 'sinatra' into sinatra-authlogic
Browse files Browse the repository at this point in the history 
Conflicts:
	require.rb
  • Loading branch information
@winton
winton committed Jun 29, 2010
2 parents 41e7e68 + a35b577 commit 6e868bf
Showing 1 changed file with 0 additions and 78 deletions.
78 changes: 0 additions & 78 deletions require.rb
View file

This file was deleted.

0 comments on commit 6e868bf

Please sign in to comment.