Mercurial > hg > soundsoftware-site
comparison app/models/user.rb @ 346:712264d5d60a cannam-pre-20110113-merge
Merge
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Thu, 31 Mar 2011 15:21:40 +0100 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |
comparison
equal
deleted
inserted
replaced
342:3564e1ae2ff7 | 346:712264d5d60a |
---|