comparison app/controllers/activities_controller.rb @ 958:352539ac7b43 live

Merge from branch "bug_521"
author Chris Cannam
date Tue, 16 Oct 2012 15:36:12 +0100
parents 0c939c159af4
children 066b55d7c053 433d4f72a19b
comparison
equal deleted inserted replaced
954:42e2437766c2 958:352539ac7b43