Skip to content

Commit

Permalink
Merge branch 'master' into config
Browse files Browse the repository at this point in the history 
Conflicts:

	lib/amazing/string.rb
  • Loading branch information
@dag
dag committed May 1, 2008
2 parents b870ca1 + 3664b84 commit 9ab3bf0
Show file tree
Hide file tree
Showing 38 changed files with 607 additions and 298 deletions.
47 changes: 0 additions & 47 deletions COPYING
View file

This file was deleted.

0 comments on commit 9ab3bf0

Please sign in to comment.