diff extra/sample_plugin/app/controllers/example_controller.rb @ 96:98b2834d136b live

Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.
author Chris Cannam
date Thu, 16 Dec 2010 13:29:23 +0000
parents 513646585e45
children 433d4f72a19b
line wrap: on
line diff