Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 262:f936ec3cb58a live
Merge from branch "feature_80"
author | Chris Cannam |
---|---|
date | Fri, 04 Mar 2011 15:06:11 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |
author | Chris Cannam |
---|---|
date | Fri, 04 Mar 2011 15:06:11 +0000 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |