diff app/controllers/application_controller.rb @ 309:de6af1693ef7 cannam-pre-20110113-merge

Fix error introduced in merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Mon, 28 Mar 2011 17:46:44 +0100
parents 4b1a23d81683
children 73ff0e6a11b1 7d8567890fa3
line wrap: on
line diff