diff test/functional/activities_controller_test.rb @ 372:bb5e1ca422f8 cannam-pre-20110113-merge

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 01 Apr 2011 12:22:58 +0100
parents 40f7cfd4df19
children af80e5618e9b
line wrap: on
line diff