diff test/unit/helpers/.svn/text-base/application_helper_test.rb.svn-base @ 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 94944d00e43c
children af80e5618e9b 8661b858af72
line wrap: on
line diff