diff test/functional/journals_controller_test.rb @ 336:7f5bd8f2d79b live

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 30 Mar 2011 11:05:36 +0100
parents 1d32c0a0efbf
children af80e5618e9b
line wrap: on
line diff