diff test/functional/journals_controller_test.rb @ 1084:3b7e11eaf1ca cannam

Merge from branch "bug_531"
author Chris Cannam
date Fri, 23 Nov 2012 13:34:20 +0000
parents cbce1fd3b1b7
children 433d4f72a19b
line wrap: on
line diff