Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 1359:a48be8a8bcba cannam
Merge from default branch
author | Chris Cannam |
---|---|
date | Thu, 18 Jul 2013 12:20:12 +0100 |
parents | bb32da3bea34 |
children | 4f746d8966dd 51364c0cd58f |
author | Chris Cannam |
---|---|
date | Thu, 18 Jul 2013 12:20:12 +0100 |
parents | bb32da3bea34 |
children | 4f746d8966dd 51364c0cd58f |