Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 738:882917cbe8d0 cannam
Merge from branch "feature_318"
author | Chris Cannam |
---|---|
date | Fri, 04 Nov 2011 16:55:52 +0000 |
parents | ec7c78040115 |
children | 5e80956cc792 |
author | Chris Cannam |
---|---|
date | Fri, 04 Nov 2011 16:55:52 +0000 |
parents | ec7c78040115 |
children | 5e80956cc792 |