Mercurial > hg > soundsoftware-site
comparison app/models/user.rb @ 318:f7c525dc7585 luisf
Merge from branch "live"
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 28 Mar 2011 18:17:06 +0100 |
| parents | 440c4f4bf2d6 |
| children | 73ff0e6a11b1 b15397a5341c |
comparison
equal
deleted
inserted
replaced
| 297:e941e6aa2b7c | 318:f7c525dc7585 |
|---|