Mercurial > hg > soundsoftware-site
comparison app/models/user_preference.rb @ 551:61e0de6cc1bb cannam_integration
Merge from branch "feature_36"
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Mon, 01 Aug 2011 19:05:24 +0100 |
| parents | 051f544170fe |
| children | cbb26bc654de |
comparison
equal
deleted
inserted
replaced
| 549:a1e091bee818 | 551:61e0de6cc1bb |
|---|