Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 925:5bf2b9fac683 luisf
merge from live
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Fri, 11 May 2012 15:58:58 +0100 |
parents | ec7c78040115 |
children | 5e80956cc792 |
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Fri, 11 May 2012 15:58:58 +0100 |
parents | ec7c78040115 |
children | 5e80956cc792 |