Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 235:61f66ddb0b65 cannam-pre-20110113-merge
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Thu, 17 Feb 2011 19:48:33 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |