diff test/functional/activities_controller_test.rb @ 280:d242e28efb23 luisf

merge from feature_72
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 22 Mar 2011 14:14:45 +0000
parents 40f7cfd4df19
children af80e5618e9b
line wrap: on
line diff