comparison test/functional/activities_controller_test.rb @ 1428:2c723b9f5b87 luisf

Merge.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 08 Oct 2013 17:07:28 +0100
parents 3e4c3460b6ca
children 622f24f53b42
comparison
equal deleted inserted replaced
1426:7367cd232b1e 1428:2c723b9f5b87