Mercurial > hg > soundsoftware-site
diff app/views/users/show.rhtml @ 528:7c7199e1f174 cannam_integration
Merge from branch "feature_36"
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Mon, 25 Jul 2011 15:00:31 +0100 |
parents | 361f1e8b2e23 |
children | 7fc15203288c |