Permalink
Browse files

Fix conflict

  • Loading branch information...
2 parents 4bd0330 + ed0916c commit a2e0220ab1b826fd826be434161e718f485288c4 @zuf committed Sep 7, 2012
Showing with 1,270 additions and 18 deletions.
  1. +1,270 −18 lib/formtastic.rb
Oops, something went wrong.

0 comments on commit a2e0220

Please sign in to comment.