Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 287:b369f41c7199 luisf
Merge from branch "bug_95"
author | Chris Cannam |
---|---|
date | Wed, 23 Mar 2011 11:32:11 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |
author | Chris Cannam |
---|---|
date | Wed, 23 Mar 2011 11:32:11 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |