diff app/controllers/welcome_controller.rb @ 1461:926dce5f5778 live

Merge fix from luisf branch
author Chris Cannam
date Mon, 06 Jan 2014 15:53:59 +0000
parents 1f9cdee56991
children 51364c0cd58f
line wrap: on
line diff