Mercurial > hg > soundsoftware-site
diff app/controllers/activities_controller.rb @ 900:f2a30f704798 luisf
Merge from branch "bug_367"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Thu, 02 Feb 2012 15:21:09 +0000 |
parents | 0c939c159af4 |
children | 066b55d7c053 433d4f72a19b |