diff app/controllers/activities_controller.rb @ 950:64d990177cda luisf

Merge (Bug #505 fix).
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 02 Aug 2012 19:41:29 +0100
parents 0c939c159af4
children 066b55d7c053 433d4f72a19b
line wrap: on
line diff