diff app/controllers/welcome_controller.rb @ 896:4884d821863a luisf

Merge from branch "bug_365"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 02 Feb 2012 14:04:20 +0000
parents dcfde3922ec2
children 5e80956cc792
line wrap: on
line diff