Mercurial > hg > soundsoftware-site
comparison app/models/user.rb @ 668:0ec052b8b297 cannam_integration
Merge from branch "feature_36"
| author | Chris Cannam |
|---|---|
| date | Fri, 09 Sep 2011 16:56:10 +0100 |
| parents | ec7c78040115 |
| children | 5e80956cc792 |
comparison
equal
deleted
inserted
replaced
| 664:ad6874c5c651 | 668:0ec052b8b297 |
|---|