Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 312:8019c250165b live
Merge from branch "feature_115"
author | Chris Cannam |
---|---|
date | Mon, 28 Mar 2011 17:50:50 +0100 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |
author | Chris Cannam |
---|---|
date | Mon, 28 Mar 2011 17:50:50 +0100 |
parents | 440c4f4bf2d6 |
children | 73ff0e6a11b1 b15397a5341c |