diff test/functional/journals_controller_test.rb @ 1077:9b5b4e7970cd live

Merge from branch "cannam"
author Chris Cannam
date Wed, 21 Nov 2012 17:47:51 +0000
parents cbce1fd3b1b7
children 433d4f72a19b
line wrap: on
line diff