diff test/functional/welcome_controller_test.rb @ 1455:5e0957fe308d luisf

merge from default branch
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 07 Nov 2013 17:12:00 +0000
parents 433d4f72a19b
children 622f24f53b42 261b3d9a4903
line wrap: on
line diff