diff app/controllers/activities_controller.rb @ 640:47b21bb3fa03 cannam_integration

Merge from branch "feature_36"
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 06 Sep 2011 12:23:51 +0100
parents 0c939c159af4
children 066b55d7c053 433d4f72a19b
line wrap: on
line diff