Permalink
Browse files

Merge branch 'master' into rails3

* master:
  add contributors list to readme
  Update README for Rails 3 installation and testing instructions
  • Loading branch information...
2 parents 4ecf746 + c81670f commit f8d06d81d487e1838b938359933819a1d143f319 @janxious janxious committed Jul 20, 2011
Showing with 11 additions and 1 deletion.
  1. +11 −1 README
View
@@ -74,4 +74,14 @@ ActsAsParanoid and PermanentRecords were both inspirations for this
http://github.com/technoweenie/acts_as_paranoid
http://github.com/fastestforward/permanent_records/
-Copyright (c) 2009 [Expected Behavior, LLC], released under the MIT license
+Contributors
+============
+* Joel Meador
+* Michael Kuehl
+* Matthew Gordon
+* Vojtech Salbaba
+* David Jones
+* Dave Woodward
+-- Thanks, guys!
+
+Copyright (c) 2009-2011 [Expected Behavior, LLC], released under the MIT license

0 comments on commit f8d06d8

Please sign in to comment.