Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 199:55c3f4afe85d luisf
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Mon, 07 Feb 2011 14:17:31 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |
author | Chris Cannam |
---|---|
date | Mon, 07 Feb 2011 14:17:31 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |